Merge branch 'ASTRA-49' into 'master'

WIP Добавил обновление дополнительной информации

See merge request andrusyakka/urban-couscous!344

src/components/base/BaseInput.vue

@@ -4,7 +4,7 @@
       v-model="value",
       :name="name",
       :class="{'circle': circle, 'font-input': true}",
-      :input-style="{ color: textColor, borderColor: borderColor}",
+      :input-style="{ color: textColor, borderColor: borderColor, resize: resize}",
       :borderless="borderless",
       :placeholder="placeholder",
       :outlined="outlined",
@@ -75,6 +75,10 @@ export default {
       type: String,
       default: "",
     },
+    resize: {
+      type: String,
+      default: "none",
+    },
     mask: String,
     debounce: [String, Number],
     width: Number,

src/pages/newMedicalCard/components/ConfidantForms/ConfidantForm.vue

@@ -133,6 +133,7 @@ export default {
       configData: confidantConfig,
       mapNetworks: mapNetworks,
       listPersons: [],
+      initPerson: null,
     };
   },
   props: {
@@ -149,11 +150,13 @@ export default {
   },
   methods: {
     choiceConfidant(e) {
-      const newConfidant = this.listPersons.find(
+      fetchWrapper
-        (el) => el.id === e.currentTarget.id
+        .get(`general/person/${e.currentTarget.id}/detail/`)
-      );
+        .then((res) => {
-      this.confidants[this.index] = getConfidantObject(newConfidant);
+          this.confidants[this.index] = getConfidantObject(res);
+          this.initPerson = res;
           this.isOpenListConfidant = false;
+        });
     },
     saveNetwork() {
       if (this.newNetwork.username) {
@@ -162,6 +165,7 @@ export default {
           username: this.newNetwork.username,
         });
         this.isOpenPopupAdding = false;
+        this.isCheckChange = true;
         this.newNetwork = {
           kind: mapNetworks["TELEGRAM"],
           username: "",
@@ -206,19 +210,14 @@ export default {
       this.confidants[this.index] = initData || getConfidantObject();
     },
     saveChange() {
-      const initConfidantData = this.initConfidant.find(
+      const initConfidantData = this.initConfidant[this.index];
-        (el) => el.id === this.confidant.id
-      );
-      const initPersonData = this.listPersons.find(
-        (el) => el.id === this.confidant.id
-      );
       const form = this.$refs.formConfidant;
       form.validate().then((validate) => {
         if (validate) {
           getRequestConfidant(
             this.confidant,
             initConfidantData,
-            initPersonData
+            this.initPerson
           ).then(() => {
             this.$store.dispatch("getMedicalCardData");
             this.isLoadingData = false;

src/pages/newMedicalCard/components/MedicalConfidantWrapper.vue

@@ -1,8 +1,8 @@
 <template lang="pug">
-  .flex.flex-col.gap-27px.w-full
+  .wrapper.flex.flex-col.gap-27px.h-full.pb-4
     .flex.flex-col.gap-2
       confidant-form(v-for="(confidant, index) in confidants" :index="index" :confidant="confidant")
-    base-button(
+    base-button.ml-30px(
       left-icon="icon-plus" 
       added-border-none
       :icon-left-size="12"
@@ -32,3 +32,13 @@ export default {
   },
 };
 </script>
+
+<style lang="sass" scoped>
+.wrapper
+  width: 83.2%
+  overflow-y: auto
+  @media (max-width: 600px)
+    width: fit-content
+  &::-webkit-scrollbar
+    width: 0
+</style>

src/pages/newMedicalCard/utils/gettersObjects.js

@@ -48,7 +48,8 @@ export function getConfidantObject(data) {
       },
       networks,
       note: {
-        value: data.note ? data.note.join("") : "",
+        id: data?.note[0]?.id,
+        value: data?.note.length ? data?.note[0].description : "",
       },
     };
   }

src/shared/utils/wrapperRequestChangeData.js

@@ -63,6 +63,32 @@ export function getRequestArrayData(
   return requests.concat(deleteRequests);
 }
 
+export function getRequestNote(note, initNote, personId) {
+  if (note.id) {
+    const initChangeNote = initNote?.value || {
+      id: initNote.id,
+      value: initNote.description,
+    };
+    if (note.value && note.value !== initChangeNote.value) {
+      return fetchWrapper.post(`general/note/${note.id}/update/`, {
+        title: note.value,
+        description: note.value,
+      });
+    }
+    if (!note.value) {
+      return fetchWrapper.del(`general/note/${note.id}/delete/`);
+    }
+  }
+  if (!note.id && note.value) {
+    return fetchWrapper.post(`general/note/create/`, {
+      title: note.value,
+      description: note.value,
+      person: personId,
+    });
+  }
+  return Promise.resolve();
+}
+
 export function getRequestConfidant(confidant, initConfidant, initPerson) {
   const medicalId = localStorage.getItem("medicalId");
   const fullName = `${confidant.last_name.value} ${confidant.first_name.value} ${confidant.patronymic.value}`;
@@ -82,7 +108,9 @@ export function getRequestConfidant(confidant, initConfidant, initPerson) {
     return fetchWrapper
       .post(`general/person/create/`, { full_name: fullName })
       .then((res) => {
-        return Promise.allSettled(
+        return getRequestNote(confidant.note, null, res.id)
+          .then(() =>
+            Promise.allSettled(
               getRequestArrayData(
                 [],
                 contacts,
@@ -91,7 +119,9 @@ export function getRequestConfidant(confidant, initConfidant, initPerson) {
                 "general",
                 "contact"
               )
-        ).then(() =>
+            )
+          )
+          .then(() =>
             fetchWrapper.post(
               `medical_card/medical_history/${medicalId}/update/`,
               {
@@ -126,6 +156,9 @@ export function getRequestConfidant(confidant, initConfidant, initPerson) {
         .post(`general/person/${confidant.id}/update/`, {
           full_name: fullName,
         })
+        .then(() =>
+          getRequestNote(confidant.note, initPerson.note, confidant.id)
+        )
         .then(() => {
           if (contacts.length) {
             return Promise.allSettled(
@@ -159,6 +192,9 @@ export function getRequestConfidant(confidant, initConfidant, initPerson) {
         .post(`general/person/${confidant.id}/update/`, {
           full_name: fullName,
         })
+        .then(() =>
+          getRequestNote(confidant.note, initConfidant.note, confidant.id)
+        )
         .then(() => {
           if (contacts.length) {
             return Promise.allSettled(