Merge pull request #84 from konsept-ch/tasks

Tasks
konsept-ch · Feb 6, 2024 · c5c31dd · c5c31dd
2 parents 74a3112 + c67e5b1
commit c5c31dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/pages/AgendaPage.jsx b/src/pages/AgendaPage.jsx
@@ -27,10 +27,9 @@ export const AgendaPage = () => {
 
     useEffect(() => {
         if (Object.keys(selectedRoomIds).length <= 1) {
-            const initialSelectedRoomIds = (rooms || []).reduce(
-                (acc, { id, location }) => ({ ...acc, [id]: location?.name === 'CEP' }),
-                { 'no-room': false }
-            )
+            const initialSelectedRoomIds = (rooms || []).reduce((acc, { id, location }) => ({ ...acc, [id]: true }), {
+                'no-room': true,
+            })
 
             setSelectedRoomIds(initialSelectedRoomIds)
         }

diff --git a/src/pages/InscriptionsPage.tsx b/src/pages/InscriptionsPage.tsx
@@ -35,7 +35,7 @@ export function InscriptionsPage() {
     const [isMassUpdateModalVisible, setIsMassUpdateModalVisible] = useState(false)
     const [selectedInscriptionId, setSelectedInscriptionId] = useState(null)
     const inscriptions = useSelector(inscriptionsSelector)
-    const [activePredefinedFiltersById, setActivePredefinedFiltersById] = useState({ onlyWebEntries: true })
+    const [activePredefinedFiltersById, setActivePredefinedFiltersById] = useState({ onlyWebEntries: false })
 
     const [updateInscriptionStatus, { isLoading: isUpdatingInscriptionStatus }] = useUpdateInscriptionStatusMutation()
 

diff --git a/src/pages/ManualInvoicesPage.jsx b/src/pages/ManualInvoicesPage.jsx
@@ -281,7 +281,7 @@ export function ManualInvoicesPage() {
                         name: 'Exporter pour Crésus',
                         action: () => {
                             const invoicesToExport = (selectedRowsIds.length > 0 ? invoicesData : [data]).filter(
-                                ({ id, status }) => selectedRowsIds.includes(id) && status === 'Traitée'
+                                ({ id }) => selectedRowsIds.includes(id)
                             )
 
                             const csvClient = Papa.unparse(
@@ -319,7 +319,9 @@ export function ManualInvoicesPage() {
                                             invoiceData.customClientTitle,
                                             invoiceData.customClientLastname,
                                             invoiceData.customClientFirstname,
-                                            invoiceData.customClientAddress.replaceAll('\n', '\\'),
+                                            (invoiceData.organizationName === 'Compte privé'
+                                                ? `${invoiceData.customClientFirstname} ${invoiceData.customClientLastname}\\`
+                                                : '') + invoiceData.customClientAddress.replaceAll('\n', '\\'),
                                             postalAddressStreet,
                                             postalAddressCode,
                                             postalAddressLocality,
@@ -365,7 +367,9 @@ export function ManualInvoicesPage() {
                                             invoiceData.items.map(({ amount }) => amount).join('/'),
                                             invoiceData.items.map(({ price }) => price).join('/'),
                                             invoiceData.items.map(({ vatCode }) => vatCode).join('/'),
-                                            invoiceData.customClientAddress.replaceAll('\n', '\\'),
+                                            (invoiceData.organizationName === 'Compte privé'
+                                                ? `${invoiceData.customClientFirstname} ${invoiceData.customClientLastname}\\`
+                                                : '') + invoiceData.customClientAddress.replaceAll('\n', '\\'),
                                             invoiceData.clientNumber,
                                             new Date(year, 0, 1, 12, 0, 0, 0).toLocaleDateString('fr-CH'),
                                             new Date(year, 11, 31, 12, 0, 0, 0).toLocaleDateString('fr-CH'),