Merge pull request #189 from Oloodi/187-category-short-description-of-the-task

187 category short description of the task

Makefile

@@ -208,6 +208,11 @@ deploy-admin-full: deploy-admin configure-iap-admin
 	@echo "✅ Admin Console deployed and IAP configured successfully!"
 
 
+# --- Frontend Web Free ---
+free-dev: dataconnect-sync
+	@echo "--> Starting free web development server on http://localhost:5174 ..."
+	@cd frontend-web-free && npm run dev -- --port 5174
+
 # --- Cloud IAP Configuration ---
 configure-iap-launchpad:
 	@echo "--> Configuring IAP for Cloud Run service [$(CR_LAUNCHPAD_SERVICE_NAME)]..."

dataconnect/connector/event/mutations.gql

@@ -22,7 +22,7 @@ mutation CreateEvent(
   $contractType: ContractType,
   $poReference: String,
   $status: EventStatus!,
-  $date: Timestamp!,
+  $date: String!,
   $shifts: Any,
   $addons: Any,
   $total: Float,
@@ -32,7 +32,19 @@ mutation CreateEvent(
   $invoiceId: UUID,
   $notes: String,
   $requested: Int,
-  $assignedStaff: Any
+  $assignedStaff: Any,
+  $department: String,
+  $createdBy: String,
+  $orderType: String,
+  $recurringStartDate: String,
+  $recurringEndDate: String,
+  $recurringDays: Any, 
+  $permanentStartDate: String,
+  $permanentDays: Any,
+  $includeBackup: Boolean,
+  $backupStaffCount: Int,
+  $recurringTime: String,
+  $permanentTime: String
 ) @auth(level: USER) {
   event_insert(
     data: {
@@ -68,8 +80,20 @@ mutation CreateEvent(
       clientPhone: $clientPhone
       invoiceId: $invoiceId
       notes: $notes
+      orderType: $orderType 
       requested: $requested
       assignedStaff: $assignedStaff
+      department: $department
+      createdBy: $createdBy
+      recurringStartDate: $recurringStartDate
+      recurringEndDate: $recurringEndDate
+      recurringDays: $recurringDays
+      permanentStartDate: $permanentStartDate
+      permanentDays: $permanentDays
+      includeBackup: $includeBackup
+      backupStaffCount: $backupStaffCount
+      recurringTime: $recurringTime
+      permanentTime: $permanentTime
     }
   )
 }
@@ -100,7 +124,7 @@ mutation UpdateEvent(
   $contractType: ContractType,
   $poReference: String,
   $status: EventStatus,
-  $date: Timestamp,
+  $date: String,
   $shifts: Any,
   $addons: Any,
   $total: Float,
@@ -110,7 +134,19 @@ mutation UpdateEvent(
   $invoiceId: UUID,
   $notes: String,
   $requested: Int,
-  $assignedStaff: Any
+  $orderType: String, 
+  $department: String,
+  $assignedStaff: Any,
+  $createdBy: String,
+  $recurringStartDate: String,
+  $recurringEndDate: String,
+  $recurringDays: Any,
+  $permanentStartDate: String,
+  $permanentDays: Any,
+  $includeBackup: Boolean,
+  $backupStaffCount: Int,
+  $recurringTime: String,
+  $permanentTime: String
 ) @auth(level: USER) {
   event_update(
     id: $id,
@@ -147,8 +183,20 @@ mutation UpdateEvent(
       clientPhone: $clientPhone
       invoiceId: $invoiceId
       notes: $notes
+      orderType: $orderType 
       requested: $requested
       assignedStaff: $assignedStaff
+      department: $department
+      createdBy: $createdBy
+      recurringStartDate: $recurringStartDate
+      recurringEndDate: $recurringEndDate
+      recurringDays: $recurringDays
+      permanentStartDate: $permanentStartDate
+      permanentDays: $permanentDays
+      includeBackup: $includeBackup
+      backupStaffCount: $backupStaffCount
+      recurringTime: $recurringTime
+      permanentTime: $permanentTime
     }
   )
 }

dataconnect/connector/event/queries.gql

@@ -45,7 +45,18 @@ query listEvents (
     notes
     requested
     assignedStaff
+    orderType 
+    department
     createdBy
+    recurringStartDate
+    recurringEndDate
+    recurringDays
+    permanentStartDate
+    permanentDays
+    includeBackup
+    backupStaffCount
+    recurringTime
+    permanentTime
   }
 }
 
@@ -87,7 +98,18 @@ query getEventById(
     invoiceId
     notes
     requested
+    orderType 
+    department
     assignedStaff
+    recurringStartDate
+    recurringEndDate
+    recurringDays
+    permanentStartDate
+    permanentDays
+    includeBackup
+    backupStaffCount
+    recurringTime
+    permanentTime
   }
 }
 
@@ -99,7 +121,7 @@ query filterEvents(
   $isRapid: Boolean,
   $isMultiDay: Boolean,
   $recurrenceType: RecurrenceType,
-  $date: Timestamp,
+  $date: String,
   $hub: String,
   $eventLocation: String,
   $contractType: ContractType,
@@ -155,6 +177,17 @@ query filterEvents(
     notes
     requested
     assignedStaff
+    orderType 
+    department
     createdBy
+    recurringStartDate
+    recurringEndDate
+    recurringDays
+    permanentStartDate
+    permanentDays
+    includeBackup
+    backupStaffCount
+    recurringTime
+    permanentTime
   }
 }

dataconnect/schema/event.gql

@@ -46,14 +46,14 @@ type Event @table(name: "events") {
   detectedConflicts: Any
   businessId: UUID! 
   businessName: String 
-  vendorId: String 
+  vendorId: String @default(expr: "auth.uid")
   vendorName: String
   hub: String                                          
   eventLocation: String
   contractType: ContractType
   poReference: String
   status: EventStatus! 
-  date: Timestamp! 
+  date: String! 
   shifts: Any
   addons: Any 
   total: Float 
@@ -64,6 +64,17 @@ type Event @table(name: "events") {
   notes: String 
   requested: Int @default(expr: "0")
   assignedStaff: Any 
+  orderType: String 
+  department: String
+  recurringStartDate: String
+  recurringEndDate: String
+  recurringDays: Any
+  permanentStartDate: String
+  permanentDays: Any
+  includeBackup: Boolean
+  backupStaffCount: Int
+  recurringTime: String
+  permanentTime: String
   createdDate: Timestamp @default(expr: "request.time")
   updatedDate: Timestamp @default(expr: "request.time")
   createdBy: String @default(expr: "auth.uid") 

frontend-web-free/src/components/events/SmartAssignModal.jsx

@@ -23,6 +23,7 @@ import {
   Check,
   Calendar,
   Sliders,
+  Clock,
   TrendingUp,
   Shield,
   DollarSign,