1.1.3 Various improvements on the interface, kanban report and calendar

mfakih294 · Jan 28, 2020 · 8d19deb · 8d19deb
1 parent 40b09f1
commit 8d19deb
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 77 deletions.
diff --git a/grails-app/controllers/ker/ExportController.groovy b/grails-app/controllers/ker/ExportController.groovy
@@ -233,7 +233,7 @@ class ExportController {
                             start          : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm':00'").format(it.startDate),
                             end            : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm':00'").format(it.endDate ?: it.startDate),
                             //it.type?.name +
-                            title          : StringUtils.abbreviate(title, 40),
+                            title          : StringUtils.abbreviate(title, 80),
                             description    : it.summary + '|' + it.description,
                             backgroundColor: '#fff',//it.type?.color ?: '#F7F9EE',
                             borderColor    : 'darkgreen',
@@ -256,7 +256,7 @@ class ExportController {
                             start          : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm':00'").format(it.startDate),
                             end            : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm':00'").format(it.endDate ?: it.startDate),
                             //it.type?.name +
-                            title          : StringUtils.abbreviate(title, 40),
+                            title          : StringUtils.abbreviate(title, 80),
                             description    : it.summary + '|' + it.description,
                             backgroundColor: '#fff',//it.type?.color ?: '#F7F9EE',
                             borderColor    : 'darkred',

diff --git a/grails-app/controllers/ker/OperationController.groovy b/grails-app/controllers/ker/OperationController.groovy
@@ -1617,6 +1617,7 @@ past.each(){
         if (!j.hasErrors()) {
             j.save(flash: true)
 //            render 'Saved with id: ' + ' ' + j.id + ': ' + j.summary
+            //render (template: '/layouts/addToCalendar', model: [record: j])
             render(template: '/gTemplates/box', model: [record: j])
         } else {
             render 'Problem saving the entry'

diff --git a/grails-app/views/appCalendar/main.gsp b/grails-app/views/appCalendar/main.gsp
@@ -46,7 +46,7 @@
 
   <script type="text/javascript" src="${resource(dir: 'plugins/fullcalendar', file: 'main4.js')}"></script>
 
-    %{--<link rel="stylesheet" href="${createLinkTo(dir: 'css', file: 'main.css')}"/>--}%
+    <link rel="stylesheet" href="${createLinkTo(dir: 'css', file: 'main-calendar.css')}"/>
 
 
   <script>
@@ -138,7 +138,11 @@
 
 //          var title = window.prompt('Event title or command (e.g. p -- title):');
 
-          jQuery('#login-form').modal();
+          var modal = jQuery('#login-form').modal();
+          $('#login-form').on($.modal.AFTER_CLOSE, function(event, modal) {
+              window.location.href = window.location;
+          });
+
 //
           jQuery('#title').val('');
           jQuery('#description').val('');
@@ -308,6 +312,7 @@
     <g:formRemote name="batchAdd2" class="commandBarInPanel"
                   url="[controller: 'operation', action: 'addFromCalendar']"
                   update="logAreaModal"
+
                   method="post">
           <table border="0">
               <tr>

diff --git a/grails-app/views/appKanban/_regions.gsp b/grails-app/views/appKanban/_regions.gsp
@@ -84,6 +84,7 @@
                 <g:each in="${mcs.Department.findAllByBookmarked(true, [sort: 'code'])}" var="d">
                     <th>d<b>${d.code}</b></th>
                 </g:each>
+
                 </thead>
 
                 <tr>

diff --git a/grails-app/views/appMain/_regions.gsp b/grails-app/views/appMain/_regions.gsp
@@ -267,7 +267,7 @@
 
             <g:textField name="input" id="quickAddTextFieldBottomTop" value=""
                          autocomplete="off"
-                         style="display: inline; margin-top: 4px; width: 100% !important;  border: 1px solid #003a69"
+                         style="display: inline; margin-top: 4px; width: 100% !important;  border: 1px solid darkgray"
                          placeholder="Command prompt..."
                          onkeyup="jQuery('#hintArea').load('${createLink(controller: 'generics', action: 'commandBarAutocomplete')}?hint=1&q=' + encodeURIComponent(jQuery('#quickAddTextFieldBottomTop').val()))"
                          onkeypress="jQuery('#notificationAreaHidden').load('/nibras/generics/verifySmartCommand', { 'line':jQuery('#quickAddTextFieldBottomTop').val() }, function (response, status, xhr) {jQuery('#quickAddTextFieldBottomTop').attr('class', '');jQuery('#quickAddTextFieldBottomTop').attr('class', response); });"

diff --git a/grails-app/views/layouts/_addToCalendar.gsp b/grails-app/views/layouts/_addToCalendar.gsp
@@ -0,0 +1,24 @@
+<link rel="stylesheet" href="${resource(dir: 'css', file: 'ui.achtung-min.css')}"/>
+<script type="text/javascript" src="${resource(dir: 'js', file: 'ui.achtung-min.js')}"></script>
+
+%{--<script type="text/javascript">--}%
+    %{--jQuery.achtung({message: '${message}', timeout: 5});--}%
+%{--</script>--}%
+
+<script type="text/javascript">
+//  var myCalendar = jQuery('#calendar');
+  var myCalendar = document.getElementById('calendar');
+
+  var calendar = FullCalendar.Calendar(myCalendar)
+
+//  myCalendar.fullCalendar();
+  var myEvent = {
+    title:"my new event",
+    allDay: true,
+    start: new Date(),
+    end: new Date()
+  };
+//jQuery('#calendar').fullCalendar('renderEvent', myEvent);
+//  calendar.fullCalendar( 'renderEvent', myEvent);
+calendar.addEvent(myEvent)
+</script>
diff --git a/run.bat b/run.bat
@@ -4,5 +4,5 @@ set GRAILS_HOME=D:\dev\grails-3.3.10
 set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_111
 set CATALINA=-server -Xmx780m
 
-grails -disable.auto.recompile=false -Dgrails.gsp.enable.reload=true run-app
+grails -disable.auto.recompile=false -Dgrails.gsp.enable.reload=true -https -Dgrails.env=development run-app
 pause
diff --git a/src/main/resources/public/css/main-calendar.css b/src/main/resources/public/css/main-calendar.css
@@ -0,0 +1,13 @@
+
+
+.fc-event-container
+.fc-content
+.fc-title {
+    display: inline  !important;;
+}
+.fc-event-container
+.fc-content .fc-time {
+    display: inline  !important;;
+    font-weight: bold !important;
+    text-decoration: underline;
+}
diff --git a/src/main/resources/public/css/main.css b/src/main/resources/public/css/main.css
@@ -42,7 +42,7 @@
 
 html {
     /*background: #f1f1f1;*/
-    font-family:  Lato Light !important;
+    font-family:  Lato !important;
     /*font-weight: ;*/
 }
 
@@ -63,7 +63,7 @@ html {
 
 html * {
     margin: 0px;
-    font-family:  Lato Light !important;
+    font-family:  Lato !important;
     /*padding: 0; SELECT NOT DISPLAYED CORRECTLY IN FIREFOX */
 }
 
@@ -89,13 +89,14 @@ html * {
     /*background: #fdfdfd !important;*/
 }
 
-.ui-layout-resizer {
-    background: darkgrey !important;
+.ui-layout-resizer-west {
+    background: #b1ada5 !important;
     /*background: #fdfdfd !important;*/
     z-index: 200000 !important;
-    padding: 2px;
-    margin: 1px;
+    padding: 1px !important;
+    /*margin-right: 4px !important;*/
     border-radius: 2px;
+    width: 10px !important;
 }
 
 .ui-layout-toggler-east{
@@ -143,7 +144,7 @@ body {
     color: #333;
     /*line-height: 1.4;*/
     font-size: 1em;
-    font-family:  Lato Light !important;
+    font-family:  Lato !important;
 
     background: #D8D4C9 url(../images/bg-main.gif) repeat-x;
     /*font: 12px/20px Verdana, Arial, Tahoma, sans-serif;*/
@@ -193,7 +194,7 @@ h1 {
 }
 
 h2 {
-    font-family: Lato Light, arial;
+    font-family: Lato, arial;
     font-size: 14px;
     color: #144a6c;
     font-weight: bold;
@@ -209,7 +210,7 @@ h2:hover {
 }
 
 h3 {
-    font-family: Lato Light, arial;
+    font-family: Lato, arial;
     font-size: 13px;
     color: #799edd;
     font-weight: bold;
@@ -222,11 +223,11 @@ h4 {
     color: #212121;
     /*4e5f6e;*/
     font-weight: bold;
-    font-size: 15px;
+    font-size: 14px !important;
     /*margin: .2em 0 .2em 0;*/
     padding: 5px;
-    /*margin-left: 1em;*/
-    font-family: Lato Light, "DejaVu Sans Mono";
+    margin-bottom: 1.2em;
+    font-family: Lato, "DejaVu Sans Mono";
 
     /*padding: 4px;*/
     /*vertical-align: top;*/
@@ -253,7 +254,7 @@ ul {
 input, select, textarea {
     background-color: #fcfcfc;
     border: 1px solid #ccc;
-    font: 11px Lato Light, tahoma, verdana, arial, helvetica, sans-serif;
+    font: 11px Lato, tahoma, verdana, arial, helvetica, sans-serif;
     margin: 2px 2px;
     padding: 2px 2px;
     min-width: 20px !important;
@@ -326,7 +327,7 @@ input:focus, textarea:focus {
     color: #ffffff !important;
     /*border-bottom: 1px solid #D3D3D3;*/
     /*border-style: solid none solid none;*/
-    font-family: Lato Light, tahoma;
+    font-family: Lato, tahoma;
     padding-top: 2px;
     /*margin-bottom: 2px;*/
     padding-bottom: 2px;
@@ -336,7 +337,7 @@ input:focus, textarea:focus {
 
 .nav a {
     color: #6E6E6E !important;
-    font-family: Lato Light, tahoma;
+    font-family: Lato, tahoma;
 }
 
 .nav a:hover {
@@ -709,7 +710,7 @@ div.calendar {
     padding: 4px;
     margin: 4px;
     font-size: 11px;
-    font-family: Lato Light, verdana;
+    font-family: Lato, verdana;
 }
 
 .appCardContainer {
@@ -740,7 +741,7 @@ div.calendar {
 
 #rssList td a {
     font-size: 12px !important;
-    font-family: Lato Light, "Segoe UI", verdana, Geneva, Arial, Helvetica, sans-serif !important;
+    font-family: Lato, "Segoe UI", verdana, Geneva, Arial, Helvetica, sans-serif !important;
     color: white !important;
     text-decoration: none;
 }
@@ -766,7 +767,7 @@ div.calendar {
 
 .nicelisting {
     font-size: 13px;
-    font-family: Lato Light, "DejaVu Sans Mono";
+    font-family: Lato, "DejaVu Sans Mono";
     line-height: 20px;
 }
 
@@ -780,7 +781,7 @@ div.calendar {
     margin-right: 10px;
     /*font-size: 11px;*/
     padding: 10px;
-    font-family: Lato Light, "DejaVu Sans Mono";
+    font-family: Lato, "DejaVu Sans Mono";
 }
 
 #panoramasTab a:hover {
@@ -817,14 +818,14 @@ div.calendar {
 .exrNotRead {
     color: #040f29 !important;
     font-size: 12px !important;
-    font-family: Lato Light, verdana !important;
+    font-family: Lato, verdana !important;
     font-weight: bold !important;
 }
 
 .exrRead {
     color: #006666 !important;
     font-size: 11px !important;
-    font-family: Lato Light, tahoma !important;
+    font-family: Lato, tahoma !important;
 }
 
 .urgent {
@@ -878,7 +879,7 @@ div.calendar {
 
 .fullTextPopup {
     font-size: 12px;
-    font-family: Lato Light, "DejaVu Sans Mono";
+    font-family: Lato, "DejaVu Sans Mono";
     line-height: 20px;
 }
 
@@ -1065,7 +1066,7 @@ ul.ui-tabs-nav {
     width: 90px;
     font-size: 11px;
     text-align: left;
-    font-family: Lato Light, georgia;
+    font-family: Lato, georgia;
     font-weight: normal;
     font-style: italic;
     overflow: hidden;
@@ -1077,12 +1078,12 @@ ul.ui-tabs-nav {
     /*width: 140px;*/
     font-size: 11px;
     font-style: normal;
-    font-family: Lato Light, "Lucida Console";
+    font-family: Lato, "Lucida Console";
 }
 
 .record-summary {
     /*width: auto;*/
-    font-family: Lato Light !important, tahoma;
+    font-family: Lato !important, tahoma;
     padding-left: 0px;
     padding-right: 2px;
     /*font-size: 11px;*/
@@ -1091,7 +1092,7 @@ ul.ui-tabs-nav {
 }
 
 .record-summary a {
-    font-family: Lato Light, tahoma;
+    font-family: Lato, tahoma;
     /*"Lucida Sans";*/
     font-size: 10px;
     text-align: left;
@@ -1664,7 +1665,7 @@ ul.ui-autocomplete.ui-menu {
     /*margin: .2em 0 .2em 0;*/
     padding: 3px;
     /*margin-left: 1em;*/
-    font-family: Lato Light, "DejaVu Sans Mono";
+    font-family: Lato, "DejaVu Sans Mono";
 
 }
 
@@ -1679,7 +1680,7 @@ h3, h4 {
 }
 
 h2 {
-    font-family: Lato Light, Georgia;
+    font-family: Lato, Georgia;
     color: rgb(92, 109, 121);
     font-weight: bold;
     /*line-height: 40px;*/
@@ -1849,7 +1850,7 @@ ul.ui-autocomplete.ui-menu {
 
 .dashboardLabel {
     font-size: 14px;
-    font-family: Lato Light, "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+    font-family: Lato, "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
     text-align: right;
     float: right;
 }
@@ -1898,7 +1899,7 @@ ul.ui-autocomplete.ui-menu {
 }
 
 .commandBarTexField {
-    font-family: Lato Light, tahoma !important;
+    font-family: Lato, tahoma !important;
     font-size: 1.1em;
     width: 98% !important;
     height: 160px;
@@ -1963,7 +1964,7 @@ ul.ui-autocomplete.ui-menu {
 
 .footerRegion a {
     font-size: 12px !important;
-    font-family: Lato Light, "Segoe UI", verdana, Geneva, Arial, Helvetica, sans-serif;
+    font-family: Lato, "Segoe UI", verdana, Geneva, Arial, Helvetica, sans-serif;
     color: white !important;
 }
 
@@ -2040,4 +2041,5 @@ a  {
 
 a :hover {
     border: 1px solid #a3a3a3;
-}
+}
+