Merge pull request #8 from raphckrman/main

update
raphckrman · May 10, 2024 · 288fc40 · 288fc40
2 parents 89889fb + b755d26
commit 288fc40
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8,272 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,6 +29,6 @@ jobs:
           registry-url: https://registry.npmjs.org/
       - run: npm i
       - run: npm run build
-      - run: npm publish --access public
+      - run: npm publish --provenance --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NODE_TOKEN }}
diff --git a/lib/api/bookingGet.ts b/lib/api/bookingGet.ts
@@ -33,13 +33,18 @@ export const getBookingWeek = async (token: string, id: number, weekNumber?: num
 
     let days = await Promise.all(terminal.jours.map(async (day) => {
       let month = weekDate.getMonth();
-      let dayNumber = parseInt(day.dayLabel.split(" ")[1])+1;
-      let firstDayOfWeek = parseInt(terminal.jours[0].dayLabel.split(" ")[1]);
+      if (day.dayLabel) {
+        let dayNumber = parseInt(day.dayLabel.split(" ")[1])+1;
+        let firstDayOfWeek = terminal.jours[0]?.dayLabel ? parseInt(terminal.jours[0].dayLabel.split(" ")[1]) : 0;
 
-      if (firstDayOfWeek > dayNumber) {
-        month = month+1;
+        if (firstDayOfWeek > dayNumber) {
+          month = month+1;
+        }
+        var date = new Date(weekDate.getFullYear(), month, dayNumber);
+      }
+      else {
+        var date = new Date(weekDate.getFullYear(), weekDate.getMonth(), day.dayOfWeek);
       }
-      let date = new Date(weekDate.getFullYear(), month, dayNumber);
 
       return new BookingDay(
         token,

diff --git a/lib/interfaces/Bookings.ts b/lib/interfaces/Bookings.ts
@@ -35,7 +35,7 @@ export interface DayBooking {
   },
   autorise: boolean,
   msg: string,
-  dayLabel: string
+  dayLabel?: string
 }
 
 export interface BookingPrice {