From 8b669cfeb6830342375d3655323e848c68c092b4 Mon Sep 17 00:00:00 2001
From: Mohamad Fakih <mfakih294@gmail.com>
Date: Tue, 5 Jan 2021 13:40:30 +0200
Subject: [PATCH] Bug fixes and enhancements

---
 build.sh                                      |  7 +--
 .../controllers/ker/ExportController.groovy   | 14 ++---
 .../controllers/ker/GenericsController.groovy |  2 +-
 .../controllers/ker/PageController.groovy     | 36 +++++++++++
 grails-app/domain/mcs/Course.groovy           |  2 +-
 grails-app/views/appCalendar/main.gsp         | 62 ++++++++++++++-----
 grails-app/views/appDashboard/main.gsp        |  7 +--
 grails-app/views/appMain/_east.gsp            |  9 ++-
 grails-app/views/appStatic/site.gsp           | 36 +++++++++--
 run.sh                                        |  5 +-
 10 files changed, 137 insertions(+), 43 deletions(-)

diff --git a/build.sh b/build.sh
index f5ab60a..867c0e6 100644
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,9 @@
 
-export PATH=/home/mf/dev/grails-3.3.10/bin:/home/mf/dev/jdk1.8.0_111/bin/:$PATH
+export PATH=$PATH:/nbr/dev/grails-3.3.10/bin:/nbr/dev/jdk1.8.0_65/bin/
 
-export GRAILS_HOME=/home/mf/dev/grails-3.3.10/
+export GRAILS_HOME=/nbr/dev/grails-3.3.10/
 
-export JAVA_HOME=/home/mf/dev/jdk1.8.0_111/
-#/usr/lib/jvm/java-11-openjdk-amd64/
+export JAVA_HOME=/nbr/dev/jdk1.8.0_65/
 
 export CATALINA="-server"
 export JAVA_OPTS="-server"
diff --git a/grails-app/controllers/ker/ExportController.groovy b/grails-app/controllers/ker/ExportController.groovy
index 801973b..b3c6c44 100755
--- a/grails-app/controllers/ker/ExportController.groovy
+++ b/grails-app/controllers/ker/ExportController.groovy
@@ -240,7 +240,7 @@ class ExportController {
     def allCalendarEvents() {
         def events = []
 
-            Task.executeQuery("from Journal t where t.startDate between :start and :end",
+            Task.executeQuery("from Journal t where t.bookmarked = 1 and  t.startDate between :start and :end",
                     //[new Date(Long.parseLong(params.start) * 1000), new Date(Long.parseLong(params.end) * 1000)]).each() {
                     [start: Date.parse('yyyy-MM-dd', params.start) - 20, end: Date.parse('yyyy-MM-dd', params.end) + 20]).each() {
 
@@ -263,7 +263,7 @@ class ExportController {
                             url            : request.contextPath + '/page/record/' + it.id + '?entityCode=J',
                             allDay         : (it.level != 'm' || it.startDate.hours < 5 ? true : false)])
             }
-      Task.executeQuery("from Planner t where t.startDate between :start and :end",
+      Task.executeQuery("from Planner t where t.bookmarked = 1 and t.startDate between :start and :end",
                     //[new Date(Long.parseLong(params.start) * 1000), new Date(Long.parseLong(params.end) * 1000)]).each() {
                     [start: Date.parse('yyyy-MM-dd', params.start) - 20, end: Date.parse('yyyy-MM-dd', params.end) + 20]).each() {
 
@@ -287,7 +287,7 @@ class ExportController {
                             allDay         : (it.level != 'm' || it.startDate.hours < 5 ? true : false)])
             }
 
-            Task.executeQuery("from Task t where t.endDate between :start and :end",
+            Task.executeQuery("from Task t where t.bookmarked = 1 and t.endDate between :start and :end",
                     //[new Date(Long.parseLong(params.start) * 1000), new Date(Long.parseLong(params.end) * 1000)]).each() {
                     [start: Date.parse('yyyy-MM-dd', params.start) - 20, end: Date.parse('yyyy-MM-dd', params.end) + 20]).each() {
 
@@ -309,7 +309,7 @@ class ExportController {
             }
 
 
-    Task.executeQuery("from Goal t where t.endDate between  :start and :end",
+    Task.executeQuery("from Goal t where t.bookmarked = 1 and t.endDate between  :start and :end",
                     //[new Date(Long.parseLong(params.start) * 1000), new Date(Long.parseLong(params.end) * 1000)]).each() {
                     [start: Date.parse('yyyy-MM-dd', params.start) - 20, end: Date.parse('yyyy-MM-dd', params.end) + 20]).each() {
 
@@ -333,7 +333,7 @@ class ExportController {
 
 
 
-            Task.executeQuery("from Book t where t.readOn between :start and :end",
+            Task.executeQuery("from Book t where t.bookmarked = 1 and t.readOn between :start and :end",
                     //[new Date(Long.parseLong(params.start) * 1000), new Date(Long.parseLong(params.end) * 1000)]).each() {
                     [start: Date.parse('yyyy-MM-dd', params.start) - 20, end: Date.parse('yyyy-MM-dd', params.end) + 20]).each() {
 
@@ -562,13 +562,13 @@ This presentation aims to give an overview of Pomegranate PKM system.
 
 
     def staticWebsiteToString() {
-        render(view: '/static/site')
+        render(view: '/appStatic/site')
     }
 
 
     def staticWebsite() {
 
-        def f = new File('/' + (OperationController.getPath('rootFolder') ?: 'mhi') + '/mcd/site.html')
+        def f = new File('/' + (OperationController.getPath('root.rps1.path') ?: '') + '/site.html')
         f.write(g.include([controller: 'export', action: 'staticWebsiteToString']).toString(), 'UTF-8')
         render 'Generation done: ' + new Date().format('HH:mm:ss')
 
diff --git a/grails-app/controllers/ker/GenericsController.groovy b/grails-app/controllers/ker/GenericsController.groovy
index d701a24..6a8fd7d 100755
--- a/grails-app/controllers/ker/GenericsController.groovy
+++ b/grails-app/controllers/ker/GenericsController.groovy
@@ -1324,7 +1324,7 @@ ll
 
         def record = grailsApplication.classLoader.loadClass(entityMapping[entityCode]).get(id)
 
-        if (record.class.declaredFields.name.contains('bookmarked') && record.bookmarked)
+        if (!'R'.contains(entityCode) && record.class.declaredFields.name.contains('bookmarked') && record.bookmarked)
             record.bookmarked = false
 
 
diff --git a/grails-app/controllers/ker/PageController.groovy b/grails-app/controllers/ker/PageController.groovy
index f19a1a6..610addf 100755
--- a/grails-app/controllers/ker/PageController.groovy
+++ b/grails-app/controllers/ker/PageController.groovy
@@ -449,7 +449,43 @@ class PageController {
     }
 
     def appCalendar() {
+
+
+        double latitude = 33.8933182;
+        double longitude = 35.5015717;
+        double timezone = ker.OperationController.getPath('prayers.timezone') ?ker.OperationController.getPath('prayers.timezone').toInteger(): 2 ;
+        // Test Prayer times here
+        PrayTime prayers = new newpackage.PrayTime();
+
+        prayers.setTimeFormat(prayers.Time12NS);
+        prayers.setCalcMethod(prayers.Jafari);
+        prayers.setAsrJuristic(prayers.Shafii);
+        prayers.setAdjustHighLats(prayers.AngleBased);
+        int[] offsets = [0, 1, 0, 0, 0, 3, 5]; // {Fajr,Sunrise,Dhuhr,Asr,Sunset,Maghrib,Isha}
+        prayers.tune(offsets);
+
+        Date now = new Date();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+
+        ArrayList<String> prayerTimes = prayers.getPrayerTimes(cal,
+                latitude, longitude, timezone);
+        ArrayList<String> prayerNames = prayers.getTimeNames();
+
+        def prayersText = ''
+//     for (int i = 0; i < prayerTimes.size(); i++) {
+        prayersText += (prayerNames.get(0) + ": " + prayerTimes.get(0) + '\n')
+        prayersText += (prayerNames.get(1) + ": " + prayerTimes.get(1) + '\n')
+        prayersText += (prayerNames.get(2) + ": " + prayerTimes.get(2) + '\n')
+        prayersText += (prayerNames.get(3) + ": " + prayerTimes.get(3) + '\n')
+        prayersText += (prayerNames.get(4) + ": " + prayerTimes.get(4) + '\n')
+        prayersText += (prayerNames.get(5) + ": " + prayerTimes.get(5) + '\n')
+//         prayersText += (prayerNames.get(6) + ": " + prayerTimes.get(6) + '\n')
+//     }
+
+
         render(view: '/appCalendar/main', model: [
+                prayersText: prayersText
         ])
     }
 
diff --git a/grails-app/domain/mcs/Course.groovy b/grails-app/domain/mcs/Course.groovy
index f675954..ed63aec 100755
--- a/grails-app/domain/mcs/Course.groovy
+++ b/grails-app/domain/mcs/Course.groovy
@@ -123,7 +123,7 @@ class Course implements Comparable {  // entity id = 130
 
 
     public String toString() {
-        return (bookmarked ? '* ' : '') + (code ? '' + code + ' ': '') + summary
+        return (bookmarked ? '* ' : '') + (code ? '[' + code + '] ': '') + summary
     }
 
     public String fullString() {
diff --git a/grails-app/views/appCalendar/main.gsp b/grails-app/views/appCalendar/main.gsp
index e7924fc..db84c6e 100755
--- a/grails-app/views/appCalendar/main.gsp
+++ b/grails-app/views/appCalendar/main.gsp
@@ -50,11 +50,11 @@
 
 
   <script>
-
+      var calendar
   document.addEventListener('DOMContentLoaded', function() {
     var calendarEl = document.getElementById('calendar');
 
-    var calendar = new FullCalendar.Calendar(calendarEl, {
+    calendar = new FullCalendar.Calendar(calendarEl, {
       isRTL: false,
     //  locale: 'ar',
       plugins: ['bootstrap', 'interaction', 'dayGrid', 'timeGrid', 'list'],
@@ -99,8 +99,8 @@
                   var endDate = new Date(currentDate.valueOf());
 
                   // Adjust the start & end dates, respectively
-                  startDate.setDate(startDate.getDate() - 1); // One day in the past
-                  endDate.setDate(endDate.getDate() + 3); // Three days into the future
+                  startDate.setDate(startDate.getDate() - 2); // One day in the past
+                  endDate.setDate(endDate.getDate() + 2); // Three days into the future
 
                   return { start: startDate, end: endDate }
               }
@@ -144,9 +144,9 @@
         // day:''  // Monday 19.07
       // },
       // lazyFetching: true,
-       firstHour: '05:00',
+       firstHour: '07:00',
       // minTime: 5,
-      minTime: '05:00',
+      minTime: '07:00',
       slotDuration: '00:30',
       // showNonCurrentDates: false,
       // dayCount: 31,
@@ -270,15 +270,20 @@
   });
 
 
-/*
+
 
   setInterval(function() {
+
       jQuery.ajax({
           type: 'GET',
           url: '${request.contextPath}/page/heartbeat',
           dataType: 'html',
           success: function(html, textStatus) {
-              if (html == 'ok') {
+              // console.log('here' + jQuery('#calendar').fullCalendar.view);
+              // console.log('here2' + calendarEl.view.title);
+
+
+              if (html == 'ok' && calendar.view.type == 'dayGrid') {
                   window.location.href = window.location;
                   jQuery('#logArea2').html("<span style='background: darkgray; color: darkgreen'>Online</span>");
               }
@@ -288,8 +293,8 @@
 //                        console.log('An error occurred! ' + ( errorThrown ? errorThrown :   xhr.status ));
           }
       });
-  }, 60000);
-  */
+  }, ${ker.OperationController.getPath('calendar.reload.interval').toInteger()});
+
 
 
   </script>
@@ -351,10 +356,37 @@
 </div>
 
   <div id="calendar-container" style="margin: 10px; text-align: left; height: 99%">
+
+      <g:if test="${ker.OperationController.getPath('hijriDate.enabled')?.toLowerCase() == 'yes' ? true : false}">
+          <div style="direction: rtl; text-align: center; ">
+          <b>
+              <b>${((java.time.chrono.HijrahDate.now().plus(ker.OperationController.getPath('hijri.adjustment') ? ker.OperationController.getPath('hijri.adjustment').toInteger(): 0, java.time.temporal.ChronoUnit.DAYS))).format(java.time.format.DateTimeFormatter.ofPattern("dd MMMM").withLocale(Locale.forLanguageTag('ar')))}</b>:
+          %{--                            &nbsp;&nbsp; ${new Date().format("E dd HH:mm")}: &nbsp;--}%
+          </b>
+          &nbsp;
+
+%{--          <g:set var="aya"--}%
+%{--                 value="${app.IndexCard.executeQuery('from IndexCard i where i.priority >= ? and i.type.code = ? and length(i.summary) < 80', [4, 'aya'], [offset: Math.floor(Math.random()*100)])[0]}"/>--}%
+%{--          {--}%
+%{--          ${aya.shortDescription}--}%
+%{--          }--}%
+%{--          (${mcs.Writing.get(aya.recordId)?.summary}--}%
+%{--          ${aya.orderInWriting})--}%
+%{--      --}%
+
+
+      <g:each in="${prayersText.split('\n')}" var='l'>
+          <span style="margin-left: 15px;">
+              <b>${raw(l)?.split(': ')[0]}</b>:
+              ${raw(l)?.split(': ')[1]}
+          </span>
+      </g:each>
+          </div>
+      </g:if>
     <div id='calendar' ></div>
   </div>
 
-<div id="login-form" class="modal" style="height: 400px; width: 600px; border: 1px solid darkgray; margin: 5px; padding: 15px !important;">
+<div id="login-form" class="modal" style="height: 500px; width: 600px; border: 1px solid darkgray; margin: 5px; padding: 15px !important;">
     %{--Event title or command (e.g. p -- title):--}%
     %{--<br/>--}%
     %{--<br/>--}%
@@ -397,14 +429,16 @@
         Summary or Nibras command*:
         <br/>
         <g:textField name="title" value="" id="title"
-                     style=" direction: rtl; text-align: right; display: inline;  font-family: tahoma ; width: 99% !important;"
-            placeholder=""
+                     style=" text-align: start  !important; unicode-bidi: plaintext !important; display: inline;  font-family: tahoma ; width: 99% !important;"
+
+
+                     placeholder=""
                      class="commandBarTexFieldTop"/>
                   <br/>
                 Description:
        <g:textArea name="description" value="" id="description" rows="5" columns="80"
                     placeholder=""
-                     style="width: 99% !important; height: 100px;direction: rtl; text-align: right; display: inline;  font-family: tahoma ; "
+                     style="width: 99% !important; height: 100px; text-align: start  !important; unicode-bidi: plaintext !important;  display: inline;  font-family: tahoma ; "
                      class="commandBarTexFieldTop"/>
                   <br/>
                   <br/>
diff --git a/grails-app/views/appDashboard/main.gsp b/grails-app/views/appDashboard/main.gsp
index 83947b1..9a2a331 100644
--- a/grails-app/views/appDashboard/main.gsp
+++ b/grails-app/views/appDashboard/main.gsp
@@ -246,12 +246,7 @@
 %{--                            &nbsp;&nbsp; ${new Date().format("E dd HH:mm")}: &nbsp;--}%
                         </b>
     &nbsp;
-    <g:each in="${prayersText.split('\n')}" var='l'>
-                                <span >
-                                        ${raw(l)}
-                                </span>
-                            </g:each>
-&nbsp;
+
                         <g:set var="aya"
                                value="${app.IndexCard.executeQuery('from IndexCard i where i.priority >= ? and i.type.code = ? and length(i.summary) < 80', [4, 'aya'], [offset: Math.floor(Math.random()*100)])[0]}"/>
                         {
diff --git a/grails-app/views/appMain/_east.gsp b/grails-app/views/appMain/_east.gsp
index ff7d97c..7a2c050 100644
--- a/grails-app/views/appMain/_east.gsp
+++ b/grails-app/views/appMain/_east.gsp
@@ -718,9 +718,9 @@
 
             <br/>
 
-            <h5 class="">
+            <h4 class="">
                 <a>Exports</a>
-            </h5>
+            </h4>
 
         %{--<div>--}%
 
@@ -741,8 +741,11 @@
             <br/>
 
 
-            <g:remoteLink controller="export" action="staticWebsite" update="notificationArea">
+            <g:remoteLink controller="export" action="staticWebsite" update="centralArea">
                 Generate static site
+
+
+
             </g:remoteLink>
             <br/>
             <g:remoteLink controller="report" action="quranReportToString" update="centralArea">
diff --git a/grails-app/views/appStatic/site.gsp b/grails-app/views/appStatic/site.gsp
index 9bbe994..1aebbfd 100644
--- a/grails-app/views/appStatic/site.gsp
+++ b/grails-app/views/appStatic/site.gsp
@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="./site/css/bl-stylesheet.css" type="text/css"/>
 
 
-    <title>PKM Static site</title>
+    <title>Nibras PKM Static site</title>
     <link rel="shortcut icon" href="./site/icons/favicon-32px.png" type="image/png"/>
 </head>
 
@@ -115,6 +115,9 @@
     %{--</h2>--}%
     %{--<br/>--}%
         <div>
+            <g:if test="${1==2}">
+
+
             <h3 title="Writings"><a id="courses">Courses</a></h3>
             <ol>
                 <g:each in="${Course.executeQuery('from Course c where c.code != null order by c.department.code, c.orderNumber')}" var="c">
@@ -133,6 +136,8 @@
                     </li>
                 </g:each>
             </ol>
+
+            </g:if>
         </div>
   <div>
             <h3 title="Writings"><a id="writings">Writings</a></h3>
@@ -142,7 +147,8 @@
                         <i>W${c.id}</i> <u>${c.course ? "(" + c.course.toString() + ")" : ''}</u>
                         <b>${c.summary}</b>:
                         <span class="text${c.language}">
-                            ${org.apache.commons.lang.StringUtils.abbreviate(c.description?.encodeAsHTML()?.replaceAll('\n', '<br/>'), 180)}
+%{--                            ${org.apache.commons.lang.StringUtils.abbreviate(c.description?.encodeAsHTML()?.replaceAll('\n', '<br/>'), 180)}--}%
+                        <a href="./W/${c.id}/index.html">Read</a>
                         </span>
                         <span style="display: block;font-size: 8px; color: gray">
                             ${c.lastUpdated?.format('dd.MM.yyyy')} /
@@ -157,6 +163,10 @@
 
 
         <div>
+
+            <g:if test="${1==2}">
+
+
             <h3 title="Excerpts"><a id="excerpts">Excerpts</a></h3>
 
             <ol>
@@ -184,12 +194,16 @@
                 </g:each>
 
             </ol>
-
+            </g:if>
         </div>
 
 
 
                             <div>
+
+                                <g:if test="${1==2}">
+
+
                                 <h3 title="Resources"><a id="resources">Resources</a></h3>
                                 <ol>
                                     <g:each in="${Book.executeQuery(OperationController.getPath('export.static.R.query'))}" var="c">
@@ -222,16 +236,21 @@
                                         </li>
                                     </g:each>
                                 </ol>
+
+                                </g:if>
                             </div>
 
 
 
         <div>
+            <g:if test="${1==2}">
+
+
             <h3 title="Tasks"><a id="tasks">Tasks</a></h3>
             <ol>
                 <g:each in="${Task.executeQuery(OperationController.getPath('export.static.T.query'))}" var="c">
                     <li>
-                        T${c.id} ${c.location?.code}
+                        T${c.id} @${c.context?.code}
 
                         ${c.course ? "(" + c.course.toString() + ")" : ''}
                         <b>${c.summary}</b>:
@@ -239,7 +258,7 @@
                             ${org.apache.commons.lang.StringUtils.abbreviate(c.description?.encodeAsHTML()?.replaceAll('\n', '<br/>'), 180)}
                         </span>
                         <span style="display: block;font-size: 8px; color: gray">
-                            ${c.status?.code}
+                            @${c.status?.code}
                             ${c.dateCreated?.format('dd.MM.yyyy')} -
                             ${c.lastUpdated?.format('dd.MM.yyyy')}
                             <pkm:listRecordFiles module="T" fileClass="himFile" recordId="${c.id}" static="yes"/>
@@ -247,11 +266,16 @@
                     </li>
                 </g:each>
             </ol>
+
+            </g:if>
         </div>
 
 
 
         <div>
+            <g:if test="${1==2}">
+
+
             <h3 title="Tasks"><a id="goals">Goals</a></h3>
             <ol>
                 <g:each in="${Goal.executeQuery(OperationController.getPath('export.static.G.query'))}" var="c">
@@ -272,6 +296,8 @@
                     </li>
                 </g:each>
             </ol>
+
+            </g:if>
         </div>
 
 
diff --git a/run.sh b/run.sh
index 1f19588..11f1820 100644
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,5 @@
+cd /nbr/dev/pkm/
+
 
 export PATH=/nbr/dev/grails-3.3.10/bin:$PATH
 export GRAILS_HOME=/nbr/dev/grails-3.3.10/
@@ -7,9 +9,8 @@ export JAVA_OPTS="-server"
 
 #grails clean
 #grails war
-
 grails -https -disable.auto.recompile=false -Dgrails.gsp.enable.reload=true run-app
 #		cp ./build/libs/nibras.war /home/alef/tomcat9/webapps/nibras.war
 
 # Keep the terminal window open until user enters an input.
-$SHELL
+