Merge pull request #22 from codebar-ag/main

main/production

Author: StanBarrows

resources/js/Components/Common/Reporting/ReportingOverview.vue

@@ -260,6 +260,13 @@ const tableData = computed(() => {
         };
     });
 });
+
+const showBillableRate = computed(() => {
+    return !!(
+        getCurrentRole() !== 'employee' ||
+        organization?.value?.employees_can_see_billable_rates
+    );
+});
 </script>
 
 <template>
@@ -420,20 +427,16 @@ const tableData = computed(() => {
                 </div>
                 <div class="px-6 pt-6 pb-3">
                     <template
-                        v-for="reportingRowEntry in aggregatedTableTimeEntries?.grouped_data"
-                        :key="reportingRowEntry.key">
+                        v-for="reportingRowEntry in tableData"
+                        :key="reportingRowEntry.description">
                         <ReportingRow
-                            :reporting-row-entry="reportingRowEntry"
-                            :grouped-type="
-                                aggregatedTableTimeEntries?.grouped_type
-                            "
-                            :show-seconds="showSeconds"
-                            :group="group"
-                            :sub-group="subGroup"></ReportingRow>
+                            :entry="reportingRowEntry"
+                            :currency="getOrganizationCurrencyString()"></ReportingRow>
                     </template>
                     <div
                         v-if="
                             aggregatedTableTimeEntries &&
+                            aggregatedTableTimeEntries.grouped_data &&
                             aggregatedTableTimeEntries.grouped_data.length > 0
                         "
                         class="border-t border-background-separator pt-3 mt-6 text-sm space-y-2">
@@ -468,7 +471,7 @@ const tableData = computed(() => {
                                 }}
                             </div>
                         </div>
-                    </template>
+                    </div>
                     <div
                         v-else
                         class="chart flex flex-col items-center justify-center py-12">

resources/js/Pages/Projects.vue

@@ -59,7 +59,7 @@ const shownProjects = computed(() => {
             const projectNameMatch = project.name.toLowerCase().includes(query);
             
             // Search in client name
-            const client = clientsMap.get(project.client_id);
+            const client = project.client_id ? clientsMap.get(project.client_id) : null;
             const clientNameMatch = client?.name.toLowerCase().includes(query) || false;
             
             return projectNameMatch || clientNameMatch;

resources/js/Pages/SharedReport.vue

@@ -7,6 +7,7 @@ import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
 import ReportingRow from '@/Components/Common/Reporting/ReportingRow.vue';
 import { formatCents } from '@/packages/ui/src/utils/money';
 import type { CurrencyFormat } from '@/packages/ui/src/utils/money';
+import { getOrganizationCurrencyString } from '@/utils/money';
 import { computed, onMounted, provide, ref } from 'vue';
 import { useQuery } from '@tanstack/vue-query';
 import { api } from '@/packages/api/src';
@@ -184,20 +185,16 @@ onMounted(async () => {
                     </div>
                     <div class="px-6 pt-6 pb-3">
                         <template
-                            v-for="reportingRowEntry in aggregatedTableTimeEntries?.grouped_data"
-                            :key="reportingRowEntry.key">
+                            v-for="reportingRowEntry in tableData"
+                            :key="reportingRowEntry.description">
                             <ReportingRow
-                                :reporting-row-entry="reportingRowEntry"
-                                :grouped-type="
-                                    aggregatedTableTimeEntries?.grouped_type
-                                "
-                                :show-seconds="false"
-                                :group="group"
-                                :sub-group="subGroup"></ReportingRow>
+                                :entry="reportingRowEntry"
+                                :currency="getOrganizationCurrencyString()"></ReportingRow>
                         </template>
                         <div
                             v-if="
                                 aggregatedTableTimeEntries &&
+                                aggregatedTableTimeEntries.grouped_data &&
                                 aggregatedTableTimeEntries.grouped_data.length >
                                     0
                             "