filter changes

Author: Tom Barber

saiku-bi-platform-plugin/pom.xml

@@ -262,6 +262,8 @@
 										<include name="*.properties" />
 									</fileset>
 								</copy>
+								<patch patchfile="addplugins.patch" originalfile="target/dist/saiku/ui/index.html" />
+
 								<zip destfile="target/saiku-plugin-${project.version}.zip">
 									<zipfileset dir="target/dist/" />
 								</zip>

saiku-ui/index.html

@@ -203,7 +203,7 @@
                     <li><a id='logout' href='#logout' title='Logout' class='logout i18n sprite'></a></li>
                     <li><a id='about' href='#about' title='About' class='about i18n sprite'></a></li>
                     <li class='separator'>&nbsp;</li>
-                    <li><a id='issue_tracker' href='#issue_tracker' title='Issue Tracker' class='bug i18n sprite'></a></li>
+<!--                    <li><a id='issue_tracker' href='#issue_tracker' title='Issue Tracker' class='bug i18n sprite'></a></li>-->
             </ul>
                 <h1 id='logo'>
                     <a href='http://www.analytical-labs.com/' title='Saiku - Next Generation Open Source Analytics' target="_blank" class='sprite'>Saiku</a>

saiku-ui/js/saiku/views/DateFilterModal.js

@@ -40,9 +40,9 @@ var DateFilterModal = Modal.extend({
 	// template_many_years_mdx: ' {logicalOperator} [Time].[Weekly].[Day].CurrentMember.NAME("{saikuDateProperty}") {comparisonOperator} \'{dates}\'',
 	template_many_years_mdx: ' {logicalOperator} {parent}.CurrentMember.NAME {comparisonOperator} \'{dates}\'',
 
-	template_mdx: '{parent} CurrentDateMember([{dimension}.{hierarchy}], \'[\"{dimension}.{hierarchy}\"]\\\.{AnalyzerDateFormat}\', EXACT)',
+	template_mdx: '{parent} CurrentDateMember([{dimension}.{hierarchy}], \'["{dimension}.{hierarchy}"]\\\.{AnalyzerDateFormat}\', EXACT)',
 
-	template_last_mdx: '{parent} LastPeriods({periodamount}, CurrentDateMember([{dimension}.{hierarchy}], \'[\"{dimension}.{hierarchy}\"]\\\.{AnalyzerDateFormat}\', EXACT))',
+	template_last_mdx: '{parent} LastPeriods({periodamount}, CurrentDateMember([{dimension}.{hierarchy}], \'["{dimension}.{hierarchy}"]\\\.{AnalyzerDateFormat}\', EXACT))',
 
 	template_dialog: _.template(
 		'<div class="box-selections">' +
@@ -489,6 +489,9 @@ var DateFilterModal = Modal.extend({
 	},
 
 	populate_mdx: function(logExp, fixedDateName, periodamount) {
+		logExp.tagdim = logExp.dimension.replace(/m/g, "\\m").replace(/y/g, "\\y").replace(/q/g, "\\q").replace(/d/g, "\\d");
+		logExp.taghier = logExp.hierarchy.replace(/m/g, "\\m").replace(/y/g, "\\y").replace(/q/g, "\\q").replace(/d/g, "\\d");
+
 		if ((logExp.workinglevel !== logExp.level) && logExp.workinglevel !== undefined) {
 			logExp.parent = '[{dimension}.{hierarchy}].[{level}].members,';
 			logExp.parent = logExp.parent.replace(/{(\w+)}/g, function(m, p) {
@@ -501,7 +504,7 @@ var DateFilterModal = Modal.extend({
 		});
 
 		if (fixedDateName === 'dayperiods') {
-			logExp.parent = '[{dimension}].[{hierarchy}].[{level}]';
+			logExp.parent = '[{dimension}.{hierarchy}].[{level}]';
 			logExp.parent = logExp.parent.replace(/{(\w+)}/g, function(m, p) {
 				return logExp[p];
 			});

saiku-ui/minify.patch

@@ -1,9 +1,9 @@
 --- index.html	2014-12-08 15:50:53.298647150 +0000
 +++ index2.html	2014-12-09 20:25:08.039928031 +0000
-@@ -105,61 +105,8 @@
+@@ -105,62 +105,8 @@
  <!-- Saiku Project -->
  <script type="text/javascript" src="js/saiku/Settings.js"></script>
- 
+
 -<script type="text/javascript" src="js/saiku/models/SaikuOlapQuery.js"></script>
 -<script type="text/javascript" src="js/saiku/render/SaikuRenderer.js"></script>
 -<script type="text/javascript" src="js/saiku/render/SaikuTableRenderer.js"></script>
@@ -22,6 +22,7 @@
 -<script type="text/javascript" src="js/saiku/views/DemoLoginForm.js"></script>
 -<script type="text/javascript" src="js/saiku/views/LoginForm.js"></script>
 -<script type="text/javascript" src="js/saiku/views/AboutModal.js"></script>
+-<script type="text/javascript" src="js/saiku/views/OverwriteModal.js"></script>
 -<script type="text/javascript" src="js/saiku/views/AddFolderModal.js"></script>
 -<script type="text/javascript" src="js/saiku/views/FilterModal.js"></script>
 -<script type="text/javascript" src="js/saiku/views/CustomFilterModal.js"></script>
@@ -60,6 +61,6 @@
  <script type="text/javascript" src="saiku.min.js"></script>
 --->
 +
- 
+
  <script type="text/javascript" src="js/saiku/plugins/I18n/plugin.js"></script>
  <!-- Saiku plugins -->