Merge branch 'pollex-dev' into sit

wayne

2022-01-26 6fa4bba623713c396432ba8b863846883d6a1906

 PAMapp/pages/myConsultantList.vue

@@ -27,6 +27,8 @@

<script lang='ts'>
import { Vue, Component, Watch, State, Action } from 'nuxt-property-decorator';

import authService from '~/shared/services/auth.service';
import { Consultant, ConsultantWithAppointmentId } from '~/shared/models/consultant.model';

@Component
@@ -78,25 +80,27 @@
        .map((item) => ({ ...item, formatDate: new Date(item.updateTime || item.createTime)}))
        .sort((preItem, nextItem) => +nextItem.formatDate - +preItem.formatDate );

    // format contacted list
      this.myConsultantList.filter((consultant) => consultant.appointments!.length)
        .forEach((consultant) => {
          consultant.appointments!.forEach((appointment) => {
            const consultantWithAppointmentId: ConsultantWithAppointmentId = {
              ...consultant,
              appointmentId: appointment.id,
              appointmentDate: appointment.appointmentDate,
              appointmentScore: appointment.satisfactionScore,
              appointmentStatus: appointment.communicateStatus,
            };
            this.contactedList.push(consultantWithAppointmentId);
          })
        });
      if (authService.isUserLogin()) {
        this.myConsultantList.filter((consultant) => consultant.appointments!.length)
          .forEach((consultant) => {
            consultant.appointments!.forEach((appointment) => {
              const consultantWithAppointmentId: ConsultantWithAppointmentId = {
                ...consultant,
                appointmentId: appointment.id,
                appointmentDate: appointment.appointmentDate,
                appointmentScore: appointment.satisfactionScore,
                appointmentStatus: appointment.communicateStatus,
              };
              this.contactedList.push(consultantWithAppointmentId);
            })
          });

      this.contactedList = this.contactedList
        .filter((appointment) => appointment['appointmentStatus'] === 'contacted')
        .map((appointment) => ({ ...appointment, sortTime: new Date(appointment.appointmentDate)}))
        .sort((preAppointment, nextAppointment) => +nextAppointment.sortTime - +preAppointment.sortTime);
        this.contactedList = this.contactedList
          .filter((appointment) => appointment['appointmentStatus'] !== 'reserved')
          .map((appointment) => ({ ...appointment, sortTime: new Date(appointment.appointmentDate)}))
          .sort((preAppointment, nextAppointment) => +nextAppointment.sortTime - +preAppointment.sortTime);
      }

    }

    //////////////////////////////////////////////////////////////////////