Grunt added to compile app

ACL Roles revamped - roles/groups are now dynamic Rx Orders fields added RxNorm drug search improved Encounter Dx group feature added Smoke Status history grid added Keyboard shortcuts added Few form fields validations added New Encounter Specialty field added Encounter Snippets are now filter by encounter specialty Few MatchaCup bugs fixed SQL install structure and data updated Compiled app.js and app.min.js files added PDF form filler lib added NoteJs support modules
gaiaehr · Nov 11, 2014 · 7d26134 · 7d26134
1 parent df92d28
commit 7d26134
Show file tree

Hide file tree

Showing 1,149 changed files with 351,175 additions and 19,167 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/JSrouter.php b/JSrouter.php
@@ -53,7 +53,7 @@
 
 print 'globals = '. json_encode( $global ).';';
 
-if(!isset($_SESSION['site']['error']) && (isset($_SESSION['user']) && $_SESSION['user']['auth'] == true)) {
+if(!isset($_SESSION['site']['error']) && (isset($_SESSION['user']) && $_SESSION['user']['auth'] == true)){
 	include_once(dirname(__FILE__) . '/dataProvider/ACL.php');
 	include_once(dirname(__FILE__) . '/dataProvider/Facilities.php');
 	include_once(dirname(__FILE__) . '/dataProvider/User.php');
@@ -84,9 +84,14 @@
 	/*
 	 * Pass all the PHP to JavaScript
 	 */
-	print 'window.acl = '. json_encode($perms).';';
-	print 'window.user = '. json_encode($userData).';';
-	print 'window.structure = '. json_encode($structure).';';
-	print 'window.settings.site_url = "'. $global['url'] .'";';
+	print 'window.acl = ' . json_encode($perms) . ';';
+	print 'window.user = ' . json_encode($userData) . ';';
+	print 'window.structure = ' . json_encode($structure) . ';';
+	print 'window.settings.site_url = "' . $global['url'] . '";';
+
+	if(isset($_SESSION['styles'])){
+		print 'window.styles = ' . json_encode($_SESSION['styles']) . ';';
+	}
+
 }
 
diff --git a/_app.php b/_app.php
@@ -61,7 +61,6 @@
         <!-- Ext library -->
 		<script type="text/javascript" src="lib/<?php print EXTJS ?>/ext-all-debug.js"></script>
 
-
 		<!-- JSrouter and Ext.deirect API files -->
 		<script src="JSrouter.php?site=<?php print $site ?>"></script>
 		<script src="data/api.php?site=<?php print $site ?>"></script>
@@ -91,14 +90,25 @@
 	            app.msg(i18n('sweet'), args.text + ' - ' + i18n('copied_to_clipboard'));
             });
 
-			/**
-			 * Ext Localization file
-			 * Using a anonymous function, in javascript.
-			 * Is not intended to be used globally just this once.
-			 */
+
             (function(){
+
+	            /**
+	             * Ext Localization file
+	             * Using a anonymous function, in javascript.
+	             * Is not intended to be used globally just this once.
+	             */
                 document.write('<script type="text/javascript" src="lib/<?php print EXTJS ?>/locale/' + i18n('i18nExtFile') + '?_v' + version + '"><\/script>')
-            })();            // Set and enable Ext.loader for dynamic class loading
+
+	            /**
+	             * Modules Styles
+	             */
+	            for(var s = 0; s < window.styles.length; s++){
+		            document.write('<link rel="stylesheet" type="text/style" href="' + window.styles[s] + '?_v' + version + '"><\/link>');
+	            }
+
+            })();
+
             Ext.Loader.setConfig({
                 enabled: true,
                 disableCaching: false,
@@ -114,6 +124,7 @@
 			for(var x = 0; x < App.data.length; x++){
 				Ext.direct.Manager.addProvider(App.data[x]);
 			}
+
 			Ext.direct.Manager.on('exception', function(e, o){
 				say(e);
 				app.alert(
@@ -123,10 +134,14 @@
 				);
 			});
 		</script>
+
 		<script type="text/javascript" src="app/view/calendar/ExtensibleAll.js"></script>
 		<script type="text/javascript" src="app/ux/Overrides.js"></script>
 		<script type="text/javascript" src="app/ux/VTypes.js"></script>
 
+		<!-- this is the compiled/minified version -->
+<!--		<script type="text/javascript" src="app/app.min.js"></script>-->
+
 		<script type="text/javascript">
             /**
 			 * Function to Copy to the clip board.
@@ -664,12 +679,15 @@ function printQRCode(pid){
 	                'administration.HL7',
 	                'administration.Practice',
 	                'administration.ReferringProviders',
+	                'administration.Roles',
 	                'administration.Specialties',
 
 	                'Cron',
 	                'DocumentViewer',
 	                'DualScreen',
+	                'Header',
 	                'InfoButton',
+	                'KeyCommands',
 	                'LogOut',
 	                'Navigation',
 	                'Support',
@@ -696,11 +714,12 @@ function printQRCode(pid){
 	                'patient.Referrals',
 	                'patient.Results',
 	                'patient.RxOrders',
-	                'patient.SocialHistory',
+	                'patient.Social',
 	                'patient.Vitals',
 
 	                'patient.Summary',
                     'patient.encounter.Encounter',
+	                'patient.encounter.EncounterSign',
 	                'patient.encounter.Snippets',
                     'patient.encounter.SOAP'
                 ],

diff --git a/_dual.php b/_dual.php
@@ -148,7 +148,7 @@
 	                'patient.Referrals',
 	                'patient.Results',
 	                'patient.RxOrders',
-	                'patient.SocialHistory'
+	                'patient.Social'
                 ],
                 launch: function() {
 	                App.Current = this;