(feat) : Additional enhancement for cases some control are left out

Author: donaldkibet

projects/ngx-formentry/src/form-entry/form-factory/question.factory.ts

@@ -905,7 +905,6 @@ export class QuestionFactory {
   toModel(schema: any, renderType: string): any {
     this.quetionIndex++;
     if (renderType === 'ui-select-extended') {
-      console.log(schema.type);
       renderType = schema.type;
     }
     if (!schema.id) {

projects/ngx-formentry/src/form-entry/value-adapters/appointment-helper.ts

@@ -55,3 +55,17 @@ export interface AppointmentResponsePayload {
   priority: unknown | null;
   recurring: boolean;
 }
+/**
+ * Interface representing the structure of an appointment payload.
+ */
+export interface AppointmentPayload {
+  status: string;
+  appointmentKind: string;
+  locationUuid: string;
+  serviceUuid: string;
+  providers: { uuid: string }[];
+  startDateTime: string;
+  endDateTime: string;
+  dateAppointmentIssued?: string;
+  uuid?: string;
+}

projects/ngx-formentry/src/form-entry/value-adapters/appointment.adapter.ts

@@ -3,27 +3,39 @@ import { ValueAdapter } from './value.adapter';
 import { Form } from '../form-factory';
 import { GroupNode, LeafNode } from '../form-factory/form-node';
 import moment from 'moment';
-import { AppointmentResponsePayload } from './appointment-helper';
-
-interface AppointmentPayload {
-  [key: string]: string | { uuid: string }[];
-  providers: Array<{ uuid: string }>;
-  locationUuid: string;
-  serviceUuid: string;
-  endDateTime: string;
-}
+import {
+  AppointmentPayload,
+  AppointmentResponsePayload
+} from './appointment-helper';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AppointmentAdapter implements ValueAdapter {
+  /**
+   * Generates the form payload for an appointment.
+   * @param {Form} form - The form object.
+   * @returns {AppointmentPayload} The generated appointment payload.
+   */
   public generateFormPayload(form: Form): AppointmentPayload {
     const uuid = form?.valueProcessingInfo?.appointmentUuid;
+    const dateAppointmentIssued =
+      form?.valueProcessingInfo?.dateAppointmentIssued;
 
     const questionNodes = this.findAppointmentQuestionNodes(form.rootNode);
     const payload = this.generateFormPayloadForQuestion(questionNodes);
-    const appointmentPayload = uuid ? { ...payload, uuid } : payload;
-    return appointmentPayload;
+
+    // If in edit mode, add the uuid to the payload
+    if (uuid) {
+      payload.uuid = uuid;
+    }
+
+    // Add dateAppointmentIssued to the payload if it exists
+    if (dateAppointmentIssued) {
+      payload.dateAppointmentIssued = dateAppointmentIssued;
+    }
+
+    return payload;
   }
 
   public populateForm(form: Form, payload: AppointmentResponsePayload): void {
@@ -86,13 +98,17 @@ export class AppointmentAdapter implements ValueAdapter {
     return appointmentNodes;
   }
 
+  /**
+   * Generates the form payload for appointment questions.
+   * @param {LeafNode[]} appointmentQuestionNodes - An array of leaf nodes representing appointment questions.
+   * @returns {AppointmentPayload} The generated appointment payload.
+   */
   private generateFormPayloadForQuestion(
     appointmentQuestionNodes: LeafNode[]
   ): AppointmentPayload {
     const formPayload = appointmentQuestionNodes.reduce<Record<string, string>>(
       (payload, node) => {
-        const appointmentKey =
-          node.question.extras.questionOptions.appointmentKey;
+        const { appointmentKey } = node.question.extras.questionOptions;
         payload[appointmentKey] = node.control.value;
         return payload;
       },
@@ -105,26 +121,37 @@ export class AppointmentAdapter implements ValueAdapter {
       duration,
       service,
       location,
-      ...restPayload
+      status = 'Scheduled',
+      appointmentKind = 'Scheduled',
+      ...restOfPayload
     } = formPayload;
 
+    const endDateTime = duration
+      ? this.calculateEndDateTime(startDateTime, parseInt(duration, 10))
+      : moment(startDateTime).endOf('day').toISOString();
+
     return {
-      ...restPayload,
+      ...restOfPayload,
+      status,
+      appointmentKind,
       locationUuid: location,
       serviceUuid: service,
       providers: [{ uuid: providers }],
       startDateTime: moment(startDateTime).toISOString(),
-      endDateTime: this.calculateEndDateTime(
-        startDateTime,
-        parseInt(duration, 10)
-      )
+      endDateTime
     };
   }
 
+  /**
+   * Calculates the end date and time based on the start date and time and duration.
+   * @param {string} startDateTime - The start date and time in ISO format.
+   * @param {number} durationMinutes - The duration in minutes.
+   * @returns {string} The calculated end date and time in ISO format.
+   */
   private calculateEndDateTime(
-    startDatetime: string,
+    startDateTime: string,
     durationMinutes: number
   ): string {
-    return moment(startDatetime).add(durationMinutes, 'minutes').toISOString();
+    return moment(startDateTime).add(durationMinutes, 'minutes').toISOString();
   }
 }

src/app/app.component.ts

@@ -384,8 +384,10 @@ export class AppComponent implements OnInit {
       encounterUuid: 'encounterUuid',
       providerUuid: 'providerUuid',
       utcOffset: '+0300',
-      locationUuid: 'some-location-uuid'
+      locationUuid: 'some-location-uuid',
+      dateAppointmentIssued: new Date().toISOString()
     };
+
     if (this.form.valid) {
       this.form.showErrors = false;
       // const payload = this.encAdapter.generateFormPayload(this.form);
@@ -399,6 +401,11 @@ export class AppComponent implements OnInit {
 
       // generate patient identifiers
       //const patientIdenfitiers = this.patientIdenfierAdapter.generateFormPayload(this.form,this.form.valueProcessingInfo['locationUuid']);
+      // generate appointment payload
+      // const appointmentPayload = this.appointmentsAdapter.generateFormPayload(
+      //   this.form
+      // );
+      // console.log('Appointment Payload', appointmentPayload);
     } else {
       this.form.showErrors = true;
       this.form.markInvalidControls(this.form.rootNode);