[FEAT][API] Display Meal Ticket Count (#194)

feat / display meal ticket report [API]
fairnesscoop · May 7, 2021 · e1c6e32 · e1c6e32
1 parent 64d4c63
commit e1c6e32
Show file tree

Hide file tree

Showing 24 changed files with 458 additions and 243 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,5 +7,15 @@
 		"editor.formatOnSave": true
 	},
 	"eslint.format.enable": true,
-	"eslint.lintTask.enable": true
+	"eslint.lintTask.enable": true,
+	"eslint.workingDirectories": [
+        {
+            "directory": "./client",
+            "changeProcessCWD": true
+        },
+		{
+            "directory": "./server",
+            "changeProcessCWD": true
+        }
+    ],
 }
diff --git a/client/src/components/Nav.svelte b/client/src/components/Nav.svelte
@@ -157,12 +157,17 @@
                   class="w-full"
                   href="human_resources/meal_tickets">{$_('human_resources.meal_tickets.title')}</a>
               </li>
-              <li class="{subLinkClass}">
+              <li class={subLinkClass}>
                 <a
                   class="w-full"
                   href="human_resources/meal_tickets">{$_('human_resources.meal_tickets.title')}</a>
               </li>
-              <li class="{subLinkClass}">
+              <li class={subLinkClass}>
+                <a
+                  class="w-full"
+                  href="human_resources/users">{$_('human_resources.users.title')}</a>
+              </li>
+              <li class={subLinkClass}>
                 <a
                   class="w-full"
                   href="human_resources/users">{$_('human_resources.users.title')}</a>

diff --git a/client/src/normalizer/time.js b/client/src/normalizer/time.js
@@ -2,11 +2,11 @@ export const minutesToHours = (value) => {
   const hours = Math.floor(value / 60);
   const minutes = value % 60;
 
-  if (0 === hours) {
+  if (hours === 0) {
     return `${value}m`;
   }
 
-  if (0 === minutes) {
+  if (minutes === 0) {
     return `${hours}h`;
   }
 

diff --git a/client/src/routes/crm/projects/_Table.svelte b/client/src/routes/crm/projects/_Table.svelte
@@ -21,6 +21,7 @@
     {#each items as { id, name, dayDuration, customer, invoiceUnit } (id)}
       <tr class="text-gray-700 dark:text-gray-400">
         <td class="px-4 py-3 text-sm">{name}</td>
+        <td class="px-4 py-3 text-sm">{customer.name}</td>
         <td class="px-4 py-3 text-sm">
           {$_(`crm.projects.invoice_unit.${invoiceUnit}`)}
         </td>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -42,7 +42,7 @@ services:
   nginx:
     image: nginx:latest
     ports:
-      - 80:80
+      - 81:80
     depends_on:
       - 'client'
       - 'api'