1.2.0 Now the Tomcat bundle can easily support more than one instance…

… of the application, by duplicating the war file under a different name, and creating the corresponding context file under conf/Catalina/locahost/<new app name>.xml
mfakih294 · Jan 29, 2020 · 334ef5b · 334ef5b
1 parent 8d19deb
commit 334ef5b
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 101 deletions.
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
@@ -115,7 +115,7 @@ environments:
             pooled: true
             jmxExport: true
             driverClassName: org.h2.Driver
-            url: jdbc:h2:./h2Db;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            url: jdbc:h2:./db/h2Db;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
             username: sa
             password: ''
             properties:
@@ -162,14 +162,13 @@ environments:
                 testOnReturn: false
                 jdbcInterceptors: ConnectionState
                 defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED
-    mysql:
+    production2:
         dataSource:
             dbCreate: update
-            url: jdbc:mysql://localhost:3306/db_nibras
+            jndiName: java:comp/env/jdbc/db_nibras2
+            pooled: true
             driverClassName: com.mysql.jdbc.Driver
             dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-            username: nibras
-            password: password
             properties:
                 jmxEnabled: true
                 initialSize: 5
@@ -187,8 +186,7 @@ environments:
                 testWhileIdle: true
                 testOnReturn: false
                 jdbcInterceptors: ConnectionState
-                defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED
-    test:
+                defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED    test:
         dataSource:
             dbCreate: update
             url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE

diff --git a/grails-app/controllers/ker/ExportController.groovy b/grails-app/controllers/ker/ExportController.groovy
@@ -236,7 +236,7 @@ class ExportController {
                             title          : StringUtils.abbreviate(title, 80),
                             description    : it.summary + '|' + it.description,
                             backgroundColor: '#fff',//it.type?.color ?: '#F7F9EE',
-                            borderColor    : 'darkgreen',
+                            borderColor    : 'darkgrey',
                             textColor      : 'black',//it.type?.style ?: '#515150',
 
                             url            : OperationController.getPath('app.URL') + '/page/record/' + it.id + '?entityCode=J',
@@ -259,7 +259,7 @@ class ExportController {
                             title          : StringUtils.abbreviate(title, 80),
                             description    : it.summary + '|' + it.description,
                             backgroundColor: '#fff',//it.type?.color ?: '#F7F9EE',
-                            borderColor    : 'darkred',
+                            borderColor    : 'darkgreen',
                             textColor      : 'black',//it.type?.style ?: '#515150',
 
                             url            : OperationController.getPath('app.URL') + '/page/record/' + it.id + '?entityCode=P',

diff --git a/grails-app/domain/security/Role.groovy b/grails-app/domain/security/Role.groovy
@@ -18,7 +18,7 @@ class Role implements Serializable {
 	}
 
 	static mapping = {
-		table '`security_role`'
+		table 'security_role'
 		cache true
 	}
 }
diff --git a/grails-app/domain/security/User.groovy b/grails-app/domain/security/User.groovy
@@ -28,7 +28,7 @@ class User implements Serializable {
     }
 
     static mapping = {
-        table '`security_user`'
+        table 'security_user'
 	    password column: '`password`'
     }
 

diff --git a/grails-app/domain/security/UserRole.groovy b/grails-app/domain/security/UserRole.groovy
@@ -81,7 +81,7 @@ class UserRole implements Serializable {
 	}
 
 	static mapping = {
-		table '`security_user_role`'
+		table 'security_user_role'
 		id composite: ['user', 'role']
 		version false
 	}

diff --git a/grails-app/views/appCalendar/main.gsp b/grails-app/views/appCalendar/main.gsp
@@ -58,10 +58,11 @@
       isRTL: false,
     //  locale: 'ar',
       plugins: ['bootstrap', 'interaction', 'dayGrid', 'timeGrid', 'list' ],
-
-        height: 'parent',
+        aspectRatio: 1,
+        contentHeight: 800,
+        height: 700,
       fixedWeekCount: false,
-      // shouldRedistribute: true,
+//       shouldRedistribute: true,
       header: {
         left: 'prev,next today',
         center: 'title',
@@ -72,10 +73,10 @@
           buttonText: 'Month',
           columnHead: true
         },timeGridWeek: {
-          buttonText: 'Week (grid)',
+          buttonText: 'Grid Week',
           columnHead: true
         },dayGridWeek: {
-          buttonText: 'Week (list)',
+          buttonText: 'List Week',
           columnHead: true
         }
 //        ,listWeek: {
@@ -121,10 +122,10 @@
         // day:''  // Monday 19.07
       // },
       // lazyFetching: true,
-      // firstHour: 5,
+       firstHour: '09:00',
       // minTime: 5,
       minTime: '05:00',
-      slotDuration: '00:30',
+      slotDuration: '00:60',
       // showNonCurrentDates: false,
       // dayCount: 31,
       weekNumbers: true,
@@ -140,7 +141,9 @@
 
           var modal = jQuery('#login-form').modal();
           $('#login-form').on($.modal.AFTER_CLOSE, function(event, modal) {
-              window.location.href = window.location;
+//              window.location.href = window.location;
+              calendar.refetchEvents()
+
           });
 
 //
@@ -255,7 +258,7 @@
 
   }
   td{
-    direction: rtl;
+    /*direction: rtl;*/
     text-align: right;
   }
 
@@ -278,12 +281,12 @@
   }
 
 
-  .prompt  {
-      width: 500px;
-      height: 200px;
-      background: black;
-      color: #FFA500;
-  }
+  /*.prompt  {*/
+      /*width: 500px;*/
+      /*height: 200px;*/
+      /*background: black;*/
+      /*color: #FFA500;*/
+  /*}*/
 
   /*.hover-end{padding:0;margin:0;font-size:75%;text-align:center;position:absolute;bottom:0;width:100%;opacity:.8}*/
 
@@ -301,7 +304,7 @@
 
 </div>
 
-  <div id="calendar-container" style="margin: 10px; text-align: right;">
+  <div id="calendar-container" style="margin: 10px; text-align: left; height: 99%">
     <div id='calendar' ></div>
   </div>
 

diff --git a/grails-app/views/appKanban/_regions.gsp b/grails-app/views/appKanban/_regions.gsp
@@ -87,7 +87,7 @@
 
                 </thead>
 
-                <tr>
+           %{--     <tr>
                     <td style="background: #d4edda">R*</td>
                     <g:each in="${mcs.Department.findAllByBookmarked(true, [sort: 'code'])}" var="d">
                         <td>
@@ -98,7 +98,7 @@
                             </g:each>
                         </td>
                     </g:each>
-                </tr>
+                </tr>--}%
                 <tr>
                     <td style="background: #fff3cd">G*</td>
                     <g:each in="${mcs.Department.findAllByBookmarked(true, [sort: 'code'])}" var="d">