Merge branch 'master' into '3-transition-medical-card'

# Conflicts:
#   src/pages/newMedicalCard/TheMedicalCard.vue
#   src/router.js
#   src/store/modules/medicalCard.js

src/components/TheHeader.vue

@@ -8,7 +8,7 @@
       )
       header-inputs
     .flex.ml-auto.items-center.gap-x-4
-      
+
       q-btn(
         flat,
         dense,
@@ -68,7 +68,7 @@ export default {
         name: "Гордеев Николай Степанович",
       },
       showPopup: false,
-      userData: JSON.parse(localStorage.getItem("userData")),
+      userData: {},
     };
   },
   computed: {
@@ -101,6 +101,7 @@ export default {
   },
   async mounted() {
     this.userData = await fetchWrapper.get("users/me");
+    this.$store.dispatch("setUserData", this.userData);
   },
 };
 </script>

src/pages/newCalendar/components/CalendarRecordPreview.vue

@@ -124,8 +124,10 @@ export default {
   },
   methods: {
     openMedicalCard(id) {
-      localStorage.setItem("medicalId", id);
+      this.getMedicalCardData({
-      this.$router.push("medical-card");
+        personId: id,
+        successCallback: (id) => this.$router.push("medical-card/" + id),
+      });
     },
     hidePreview() {
       this.internalPreview = false;
@@ -141,7 +143,7 @@ export default {
       });
     },
     ...mapActions({
-      getMedicalCardData: "getMedicalCardData",
+      getMedicalCardData: "getMedicalCardDataByPersonId",
     }),
   },
 };

src/pages/newMedicalCard/TheMedicalCard.vue

@@ -48,12 +48,7 @@ export default {
     medical: (state) => state.medical.medicalCard,
   }),
   created() {
-    if (!localStorage.getItem("medicalId")) this.$router.push("/calendar");
+    this.$store.dispatch("getMedicalDataById", this.$route.params.id);
-    this.$store.dispatch("getMedicalCardData");
-    this.$router.push({
-      name: "medical",
-      params: { id: localStorage.getItem("medicalCardId") },
-    });
   },
 };
 </script>

src/router.js

@@ -40,11 +40,7 @@ export default createRouter({
         { path: "clients", component: TheUser },
         { path: "medcards", component: TheMedcards },
         { path: "settings", component: TheSettings },
-        {
+        { path: "medical-card/:id", component: TheMedicalCard },
-          name: "medical",
-          path: "medical-card/:id?",
-          component: TheMedicalCard,
-        },
       ],
     },
   ],

src/store/index.js

@@ -29,4 +29,16 @@ export default createStore({
       return data;
     },
   },
+
+  actions: {
+    setUserData({ commit }, props) {
+      commit("setUserData", props);
+    },
+  },
+
+  mutations: {
+    setUserData(state, props) {
+      state.userData = { ...props };
+    },
+  },
 });

src/store/modules/medicalCard.js

@@ -450,30 +450,44 @@ const actions = {
         commit("setBenefitData", res.results);
       });
   },
-  createMedicalCard(id) {
+  createMedicalCard(ctx, id) {
     fetchWrapper.post("medical_cards", {
       person_id: id,
       number: String(Math.floor(1 + Math.random() * (100000000 + 1 - 1))),
     });
-    return this.getMedicalCardData(id);
+    return this.getMedicalCardDataByPersonId(ctx, id);
   },
-  getMedicalCardData({ commit }) {
+  getMedicalCardDataByPersonId({ commit }, { personId, successCallback }) {
-    fetchWrapper
+    fetchWrapper.get(`medical_cards/person/${personId}`).then((data) => {
-      .get(`medical_cards/person/${localStorage.getItem("medicalId")}`)
+      if (!data) {
-      .then((data) => {
+        return this.createMedicalCard({ commit }, personId);
-        if (!data) {
+      }
-          return this.createMedicalCard(localStorage.getItem("medicalId"));
+      commit("setMedicalCard", data);
-        }
+      commit("setBasicData");
-        localStorage.setItem("medicalCardId", data.id);
+      commit("setContactsData");
-        commit("setMedicalCard", data);
+      commit("setDocumentsData");
-        commit("setBasicData");
+      commit("setAllergiesData");
-        commit("setContactsData");
+      commit("setConfidantData");
-        commit("setDocumentsData");
+      commit("setHealthStateData");
-        commit("setAllergiesData");
+      commit("setEventsPersonData", personId);
-        commit("setConfidantData");
+      successCallback?.(data?.id);
-        commit("setHealthStateData");
+    });
-        commit("setEventsPersonData", data?.person?.id);
+  },
-      });
+
+  getMedicalDataById({ commit }, id) {
+    fetchWrapper.get(`medical_cards/${id}`).then((data) => {
+      if (!data) {
+        return;
+      }
+      commit("setMedicalCard", data);
+      commit("setBasicData");
+      commit("setContactsData");
+      commit("setDocumentsData");
+      commit("setAllergiesData");
+      commit("setConfidantData");
+      commit("setHealthStateData");
+      commit("setEventsPersonData", data?.person?.id);
+    });
   },
   getPersonsFiltredList() {
     return fetchWrapper