tripeur 4 年之前
父節點
當前提交
cca02b958c
共有 5 個文件被更改,包括 8 次插入6 次删除
  1. 5 3
      src/PlannerApp.vue
  2. 1 1
      src/models/Benevole.ts
  3. 1 1
      src/models/Competence.ts
  4. 1 1
      src/models/Creneau.ts
  5. 0 0
      src/models/SolverInterface.ts

+ 5 - 3
src/PlannerApp.vue

@@ -49,7 +49,7 @@ import {
   JustificationObject,
   ScoreExplanation,
   HardConstraint,
-} from "@/models/SolverInput";
+} from "@/models/SolverInterface";
 import updatePlanningVersions from "@/mixins/updatePlanningVersions";
 import importJsonState from "@/mixins/ImportJsonState";
 import { MutationTypes } from "@/store/Mutations";
@@ -416,8 +416,10 @@ export default defineComponent({
                 } else {
                   const parseObj = o as JustificationObject;
                   const slot = this.$store.getters.getCreneauById(parseObj.slotId);
-                  if (o.type == "MealSlot" & slot ){
-                    return slot.toString() + "\t" + slot.benevoleIdList.length + "/" + slot.maxAttendee;
+                  if (o.type == "MealSlot" && slot) {
+                    return (
+                      slot.toString() + "\t" + slot.benevoleIdList.length + "/" + slot.maxAttendee
+                    );
                   }
                   const benevole = this.$store.getters.getBenevoleById(parseObj.volonteerId);
                   return `Bénevole :\t${benevole?.shortame}<br>${slot?.toString()}`;

+ 1 - 1
src/models/Benevole.ts

@@ -1,4 +1,4 @@
-import { VolonteerRaw } from "./SolverInput";
+import { VolonteerRaw } from "./SolverInterface";
 
 interface IBenevole {
   id?: number;

+ 1 - 1
src/models/Competence.ts

@@ -1,4 +1,4 @@
-import { Skill } from "./SolverInput";
+import { Skill } from "./SolverInterface";
 
 export interface ICompetence {
   id?: number;

+ 1 - 1
src/models/Creneau.ts

@@ -1,6 +1,6 @@
 import dayjs from "dayjs";
 import { Event, EventJSON } from "jc-timeline";
-import { MealSlot, TimeslotRaw } from "./SolverInput";
+import { MealSlot, TimeslotRaw } from "./SolverInterface";
 
 export interface ICreneau {
   event: Event;

+ 0 - 0
src/models/SolverInput.ts → src/models/SolverInterface.ts