Merge pull request #29 from atiratree/filter-by-group

filter by group to make the generation more performant
atiratree · Oct 10, 2024 · 6bb35a1 · 6bb35a1
2 parents 3545335 + aa32b23
commit 6bb35a1
Show file tree

Hide file tree

Showing 25 changed files with 138 additions and 34 deletions.
diff --git a/src/Billing/Utils.js b/src/Billing/Utils.js
@@ -41,7 +41,7 @@ function include(filename) {
  * @return {Array<Object>} array with name of all clients
  */
 function getClients() {
-  return Utils.sort(Utils.convertObjectsToArrayByProperty(Utils.findClients(), 'name'));
+  return Utils.sort(Utils.convertObjectsToArrayByProperty(Utils.findClients(['name']), 'name'));
 }
 
 /**

diff --git a/src/Billing/WriteBilling.js b/src/Billing/WriteBilling.js
@@ -7,9 +7,12 @@
  * @return {string} url of new spreadsheet
  */
 function createBilling(from, to, client) {
-  const spreadsheetData = Utils.extractAllSpreadsheetData(from, to);
+  const groups = Utils.convertObjectsToArrayByProperty(Utils.findGroupClients(['group'], { name: client }), 'group');
+  const groupSet = new Set(groups);
+  const spreadsheetData = Utils.extractAllSpreadsheetData(from, to, groupSet);
   const ss = Utils.createSpreadsheet({
-    type: 'Fakturace'
+    type: 'Fakturace',
+    details: client
   });
   const sheet = ss.getActiveSheet();
 

diff --git a/src/Billing/appsscript.json b/src/Billing/appsscript.json
diff --git a/src/CalendarAndFilesScheduler/appsscript.json b/src/CalendarAndFilesScheduler/appsscript.json
diff --git a/src/ConsistencyChecker/appsscript.json b/src/ConsistencyChecker/appsscript.json
diff --git a/src/Create/appsscript.json b/src/Create/appsscript.json
diff --git a/src/Delete/appsscript.json b/src/Delete/appsscript.json
diff --git a/src/EmailSender/appsscript.json b/src/EmailSender/appsscript.json
diff --git a/src/PdfBackuper/Code.js b/src/PdfBackuper/Code.js
@@ -31,7 +31,7 @@ function doGet(e) {
 function processForm(formObject) {
   try {
     var errorMsg = {fromErr:'',toErr:''};
-    var from,to;
+    var from, to, group, groupHumanReadableName;
 
     from = Utils.validate(errorMsg,formObject.fromBox,{
       actions:['validateDate',],
@@ -55,9 +55,24 @@ function processForm(formObject) {
       errorMsg.fromErr = '*datum od je větší než datum do';
     }
 
+    group = formObject.selectBox;
+    if (group == null) {
+      group = '';
+    }
+    if (group != '') {
+      group = Utils.validate(errorMsg,formObject.selectBox,{
+        actions:['notUnique'],
+        actionObjs:[{uniqueArray:getGroups()}],
+        actionErrors:[{selectErr:'*zadejte validní skupinu'}]
+      });
+      groupHumanReadableName = group;
+    } else {
+      groupHumanReadableName = "Všechny Skupiny";
+    }
+
     if (Utils.isObjErrorFree(errorMsg)) {
-      errorMsg.success = backupToPdf(from,to);
-      Utils.log('Backuped to pdf in time span ' + from + ' - ' + to );
+      errorMsg.success = backupToPdf(from,to, group, groupHumanReadableName);
+      Utils.log('Backuped to pdf for group ' + groupHumanReadableName + ' in time span ' + from + ' - ' + to);
     }
 
     return errorMsg;

diff --git a/src/PdfBackuper/PdfBackuper.js b/src/PdfBackuper/PdfBackuper.js
@@ -1,8 +1,13 @@
-function backupToPdf (from, to) {
+function backupToPdf (from, to, group, groupHumanReadableName) {
+  groupSet = null;
+  if (group != '') {
+    groupSet = new Set([group])
+  }
+
   const time = new Date().toISOString();
   const ROZPIS = 'Rozpis'
 
-  const folder = DriveApp.createFolder('Záloha_' + time);
+  const folder = DriveApp.createFolder('Záloha_' + time + '_' + groupHumanReadableName);
 
   const tmpSS = SpreadsheetApp.create('Tmp');
   const tmpSSId = tmpSS.getId();
@@ -14,6 +19,9 @@ function backupToPdf (from, to) {
     Utils.findFiles([], {
       type: ROZPIS
     }).filter(function (file) {
+      if (groupSet != null && !groupSet.has(file.group)) {
+        return false;
+      }
       return Utils.isWeekWithinDates(from, to, file.year, file.week);
     }).forEach(function (file) {
 

diff --git a/src/PdfBackuper/Utils.js b/src/PdfBackuper/Utils.js
@@ -8,6 +8,13 @@ function include(filename) {
   return HtmlService.createHtmlOutputFromFile(filename).getContent();
 }
 
+/**
+ * @return {Array<Object>} array with name of all groups
+ */
+function getGroups() {
+  return Utils.sort(Utils.convertObjectsToArrayByProperty(Utils.findGroups(['group']), 'group'));
+}
+
 /**
  * Creates presentable HTML for a browser
  * *cannot be run from library, becaouse of filename

diff --git a/src/PdfBackuper/appsscript.json b/src/PdfBackuper/appsscript.json
diff --git a/src/PdfBackuper/main.html b/src/PdfBackuper/main.html
@@ -19,6 +19,14 @@
           <input id='toBox' type='date' name='toBox' min='1900-01-01' required='true' >
           <label id='toErr' class='error' for='toBox' hidden='true'></label>
         </p>
+        <p>
+          <label for='selectBox'>Skupina</label>
+          <br>
+          <select id='selectBox' name='selectBox'>
+            <option value="">Všechny Skupiny</option>
+          </select>
+          <label id='selectErr' class='error' for='selectBox'  hidden='true'></label>
+        </p>
         <p id='submit'>
           <input class='button' type='submit' value='Zálohuj do PDF'>
         </p>
@@ -38,3 +46,4 @@
   </div>
 </div>
 <?!= include('javascript'); ?>
+<?!= include('pdfbackuper-js'); ?>
diff --git a/src/PdfBackuper/pdfbackuper-js.html b/src/PdfBackuper/pdfbackuper-js.html
@@ -0,0 +1,9 @@
+<!-- Javascript for billing which fills form with clients-->
+<script>
+google.script.run.withSuccessHandler(function(obj) {
+  var options = $('#selectBox');
+  $.each(obj, function() {
+    options.append($('<option />').val(this).text(this));
+  });
+}).getGroups();
+</script>
diff --git a/src/RenameGroup/appsscript.json b/src/RenameGroup/appsscript.json
diff --git a/src/SheetRedirect/appsscript.json b/src/SheetRedirect/appsscript.json
diff --git a/src/Statistics/Stat.js b/src/Statistics/Stat.js
@@ -6,7 +6,7 @@
  */
 function process(formObject) {
   var errorMsg = {fromErr:'',toErr:''};
-  var from,to;
+  var from, to, group, groupHumanReadableName;
 
   from = Utils.validate(errorMsg,formObject.fromBox,{
     actions:['validateDate',],
@@ -30,9 +30,24 @@ function process(formObject) {
     errorMsg.fromErr = '*datum od je větší než datum do';
   }
 
+  group = formObject.selectBox;
+  if (group == null) {
+    group = '';
+  }
+  if (group != '') {
+    group = Utils.validate(errorMsg,formObject.selectBox,{
+      actions:['notUnique'],
+      actionObjs:[{uniqueArray:getGroups()}],
+      actionErrors:[{selectErr:'*zadejte validní skupinu'}]
+    });
+    groupHumanReadableName = group;
+  } else {
+    groupHumanReadableName = "Všechny Skupiny";
+  }
+
   if(Utils.isObjErrorFree(errorMsg)) {
-    errorMsg.success = createStatistics(from,to);
-    Utils.log('Generated stats in time span ' + from + ' - ' + to );
+    errorMsg.success = createStatistics(from,to, group, groupHumanReadableName);
+    Utils.log('Generated stats for group ' + groupHumanReadableName + ' in time span ' + from + ' - ' + to );
   }
 
   return errorMsg;

diff --git a/src/Statistics/Utils.js b/src/Statistics/Utils.js
@@ -56,6 +56,13 @@ function include(filename) {
   return HtmlService.createHtmlOutputFromFile(filename).getContent();
 }
 
+/**
+ * @return {Array<Object>} array with name of all groups
+ */
+function getGroups() {
+  return Utils.sort(Utils.convertObjectsToArrayByProperty(Utils.findGroups(['group']), 'group'));
+}
+
 /**
  * Creates presentable HTML for a browser
  * *cannot be run from library, becaouse of filename

diff --git a/src/Statistics/WriteStats.js b/src/Statistics/WriteStats.js
@@ -2,13 +2,21 @@
  * Creates statistics spreadsheet in user's google drive and generates data into it
  *
  * @param from from which day stats are going to be created
- * @param to  to which day stats are going to be created
+ * @param to to which day stats are going to be created
+ * @param groups stats are going to be created only for this group if not empty
+ * @param groupHumanReadableName group name or an identifier for all groups
  * @return {string} url of new spreadsheet
  */
-function createStatistics(from, to) {
-  let spreadsheetData = Utils.extractAllSpreadsheetData(from, to); // can throw timeout
+function createStatistics(from, to, group, groupHumanReadableName) {
+  groupSet = null;
+  if (group != '') {
+    groupSet = new Set([group])
+  }
+
+  let spreadsheetData = Utils.extractAllSpreadsheetData(from, to, groupSet); // can throw timeout
   const ss = Utils.createSpreadsheet({
-    type: 'Statistika'
+    type: 'Statistika',
+    details: groupHumanReadableName
   });
   const clientsSheet = ss.getActiveSheet();
   const clientsSheet2 = ss.insertSheet('Klienti Počet návštěv');
@@ -25,9 +33,9 @@ function createStatistics(from, to) {
      return !eventsMap[item['event']];
   });
 
-  writeStats(spreadsheetData, clientsSheet, 'event', from, to, false);
-  writeStats(spreadsheetData, clientsSheet2, 'event', from, to, true);
-  writeStats(spreadsheetData, assistantsSheet, 'employee', from, to, false);
+  writeStats(spreadsheetData, clientsSheet, 'event', from, to, false, groupHumanReadableName);
+  writeStats(spreadsheetData, clientsSheet2, 'event', from, to, true, groupHumanReadableName);
+  writeStats(spreadsheetData, assistantsSheet, 'employee', from, to, false, groupHumanReadableName);
   return ss.getUrl();
 }
 
@@ -40,8 +48,9 @@ function createStatistics(from, to) {
  * @param from from which data to write stats
  * @param to to which data to write stats
  * @param onlyCount measure occurences count instead of duration
+ * @param groupHumanReadableName group name or an identifier for all groups
  */
-function writeStats(spreadsheetData, sheet, type, from, to, onlyCount) {
+function writeStats(spreadsheetData, sheet, type, from, to, onlyCount, groupHumanReadableName) {
   const months = Utils.getMonthsNames();
   // stats = {
   //   "John": {
@@ -133,7 +142,7 @@ function writeStats(spreadsheetData, sheet, type, from, to, onlyCount) {
       color: '#E2F3FF'
     });
   }
-  writeToCell(sheet, sortedFoundNames.length + 8, 1, '* Statistika v časovém období: ' + Utils.getFormatedDate(from, true) + ' - ' + Utils.getFormatedDate(
+  writeToCell(sheet, sortedFoundNames.length + 8, 1, '* Statistika pro ' + groupHumanReadableName + ' v časovém období: ' + Utils.getFormatedDate(from, true) + ' - ' + Utils.getFormatedDate(
     to, true));
 }
 

diff --git a/src/Statistics/appsscript.json b/src/Statistics/appsscript.json
diff --git a/src/Statistics/main.html b/src/Statistics/main.html
@@ -19,6 +19,14 @@
           <input id='toBox' type='date' name='toBox' min='1900-01-01' required='true' >
           <label id='toErr' class='error' for='toBox' hidden='true'></label>
         </p>
+        <p>
+          <label for='selectBox'>Skupina</label>
+          <br>
+          <select id='selectBox' name='selectBox'>
+            <option value="">Všechny Skupiny</option>
+          </select>
+          <label id='selectErr' class='error' for='selectBox'  hidden='true'></label>
+        </p>
         <p id='submit'>
           <input class='button' type='submit' value='Zpracuj'>
         </p>
@@ -38,3 +46,4 @@
   </div>
 </div>
 <?!= include('javascript'); ?>
+<?!= include('statistics-js'); ?>
diff --git a/src/Statistics/statistics-js.html b/src/Statistics/statistics-js.html
@@ -0,0 +1,9 @@
+<!-- Javascript for billing which fills form with clients-->
+<script>
+google.script.run.withSuccessHandler(function(obj) {
+  var options = $('#selectBox');
+  $.each(obj, function() {
+    options.append($('<option />').val(this).text(this));
+  });
+}).getGroups();
+</script>
diff --git a/src/TableScript/appsscript.json b/src/TableScript/appsscript.json
diff --git a/src/Update/appsscript.json b/src/Update/appsscript.json