Merge branch 'master' into UC-161

src/components/HeaderInputs.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   .header-inputs-wrapper.flex.items-center.font-medium.text-base(:class="{ open: isOpen }")
-    .select-container(@click="changeState")
+    .select-container(@click="changeState", v-click-outside="closeOptions")
       .select-wrapper.flex.items-center.cursor-pointer.mx-4.my-2
         .icon-wrapper.icon-search.flex.text-lg.justify-center.items-center
         span.custom-input.select-input.inline-block.box-border.align-middle.pl-2.pr-1 {{ selectedFilter }}
@@ -30,6 +30,9 @@ export default {
     selectFilter(filter) {
       this.selectedFilter = filter;
     },
+    closeOptions() {
+      this.isOpen = false;
+    },
   },
 };
 </script>

src/components/base/BaseCustomSelect.vue

@@ -86,8 +86,8 @@ export default {
   box-shadow: 1px 1px 8px rgba(37, 40, 80, 0.15)
   border-radius: 4px
   background-color: white
+  max-height: 140px
   overflow-y: auto
-  height: 140px
 .placeholder
   color: #090A15
   opacity: 0.5

src/components/base/BaseSidebarButton.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   a(:href="path")
-    button.button.cursor-pointer.text-4xl.py-3.pr-4.pl-3(:id="id" :class="{active:active}" @click="(e) => changeStylePage(e)")
+    button.button.cursor-pointer.text-4xl.py-3.pr-4.pl-3.transition(:id="id" :class="{active:active}" @click="(e) => changeStylePage(e)")
       slot
 </template>
 

src/pages/calendar/components/CalendarColumn.vue

@@ -13,7 +13,7 @@
         img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg")
       column-header-checkbox
     .body.pl-1
-      transition-group(name="card", tag="div")
+      transition-group(name="card")
         calendar-event-card(
           v-for="event in dayEvents",
           :key="event.id",

src/pages/calendar/components/CalendarEventCard.vue

@@ -228,7 +228,7 @@ export default {
       immediate: true,
       handler(newValue) {
         if (newValue === true) {
-          this.setDefaultTheme();
+          this.isActive = false;
           this.$emit("reset-change-form");
         }
       },

src/pages/calendar/components/CalendarFormAddEvent.vue

@@ -288,17 +288,29 @@ export default {
       this.eventData = {};
     },
     async updateEventData() {
-      this.eventData = {
+      if (
-        start: this.mergeDate(this.eventDate, this.startTime),
+        Object.keys(
-        end: this.mergeDate(this.eventDate, this.endTime),
+          this.findPerson(this.ownersData, this.employees, "employee")
-        kind: this.kind.label,
+        ).length > 0 &&
-        employees: [
+        Object.keys(this.findPerson(this.membersData, this.members, "person"))
-          this.findPerson(this.ownersData, this.employees, "employee"),
+          .length > 0
-        ],
+      ) {
-        members: [this.findPerson(this.membersData, this.members, "person")],
+        this.eventData = {
-      };
+          start: this.mergeDate(this.eventDate, this.startTime),
-      await this.postUpdateEvent(this.id, this.eventData);
+          end: this.mergeDate(this.eventDate, this.endTime),
-      this.eventData = {};
+          kind: this.kind.label,
+          employees: [
+            this.findPerson(this.ownersData, this.employees, "employee"),
+          ],
+          members: [this.findPerson(this.membersData, this.members, "person")],
+        };
+        await this.postUpdateEvent(this.id, this.eventData);
+        this.eventData = {};
+      } else
+        this.addErrorNotification(
+          "Событие не может быть изменено",
+          "Клиент был удален"
+        );
     },
     clearForm() {
       if (this.selectedEventData.id) this.$emit("close-change-form");
@@ -310,23 +322,29 @@ export default {
     },
     findPerson(requestedList, object, field) {
       let foundPerson = requestedList.find(({ id }) => id === object[field].id);
-      let returnedData = {
+      if (foundPerson) {
-        [field]: {
+        let returnedData = {
-          id: foundPerson.id,
+          [field]: {
-          last_name: foundPerson.last_name,
+            id: foundPerson.id,
-          first_name: foundPerson.first_name,
+            last_name: foundPerson.last_name,
-          patronymic: foundPerson.patronymic,
+            first_name: foundPerson.first_name,
-          color: foundPerson.color,
+            patronymic: foundPerson.patronymic,
-        },
+            color: foundPerson.color,
-        role: object.role,
+          },
-      };
+          role: object.role,
-      if (object.id) returnedData.id = object.id;
+        };
-      return returnedData;
+        if (object.id) returnedData.id = object.id;
+        return returnedData;
+      }
+      return {};
     },
     async postCreateEvent(event) {
       const response = await fetchWrapper.post("registry/event/create/", event);
       if (response.type && response.type === "validation_error") {
-        this.addErrorNotification(response);
+        this.addErrorNotification(
+          response.errors[0].code,
+          response.errors[0].detail
+        );
       } else {
         this.addSuccessNotification("Событие успешно создано");
         this.clearForm();
@@ -338,7 +356,10 @@ export default {
         event
       );
       if (response.type && response.type === "validation_error") {
-        this.addErrorNotification(response);
+        this.addErrorNotification(
+          response.errors[0].code,
+          response.errors[0].detail
+        );
       } else {
         this.addSuccessNotification("Изменения успешно сохранены");
         this.clearForm();
@@ -362,14 +383,8 @@ export default {
         return id;
       }
     },
-    addErrorNotification(error) {
+    addErrorNotification(title, message) {
-      addNotification(
+      addNotification(new Date().getTime(), title, message, "error", 5000);
-        new Date().getTime(),
-        error.errors[0].code,
-        error.errors[0].detail,
-        "error",
-        5000
-      );
     },
     addSuccessNotification(message) {
       addNotification(new Date().getTime(), message, "", "success", 5000);

src/pages/clients/components/ClientTablePagination.vue

@@ -5,7 +5,7 @@
       :disabled="disabledPreviousButton"
     )
       .icon-down-arrow.arrow-left
-    button.item.flex.items-center.justify-center(
+    button.item.flex.items-center.justify-center.transition.duration-100.ease-linear(
       v-for="page, index in pageCount",
       :key="index",
       :id="page",

src/pages/clients/components/ClientsTable.vue

@@ -1,48 +1,54 @@
 <template lang="pug">
-  .wrapper-table.relative.flex.flex-col.px-6.py-6.h-full.w-full
+  .wrapper-table.relative.flex.px-6.py-6.h-full.w-full
-    clients-table-hat(
+    transition(name="table", mode="out-in")
-      :is-open-actions="marked.length",
+      .flex.justify-center.items-center.w-full(v-if="dataClientsPresence")
-      :open-form="openForm",
+        base-loader(
-      :clearing-text-search="clearingTextSearch",
+          :width="60",
-      :change-clearing-text-search="changeClearingTextSearch",
+          :height="60"
-      @search="filterDataClients",
-    )
-    .flex.flex-col.h-full.table-container.w-full.mt-8.mb-3
-      base-modal(v-model="showMedicalCard")
-        form-create-medical-card
-      clients-table-header(:check="selectedCheck" :is-check="selectAll")
-      .flex.flex-col
-        clients-table-row(
-          v-for="client in dataClients",
-          :key="client.id",
-          :id="client.id",
-          :url="url",
-          :is-check="marked.includes(client.id)",
-          :check="selectedCheck",
-          :client="client",
-          :deleted-client-id="deletedRowId",
-          :update-data-client="updateDataClient",
-          :fetch-data-clients="fetchDataClients",
-          :create-medical-card="createMedicalCard",
-          @delete-client="deleteClientHandler",
-          @recover-client="clearDeletedRowId",
         )
-    client-table-pagination(
+      .relative.flex.flex-col.h-full.w-full(v-else)
-      v-if="paginationInfo.length > 1"
+        clients-table-hat(
-      :pagination-info="paginationInfo"
+          :is-open-actions="marked.length",
-      @previous-page="switchPreviousPage",
+          :open-form="openForm",
-      @next-page="switchNextPage",
+          :clearing-text-search="clearingTextSearch",
-      @set-current-page="changeCurrentTablePage"
+          :change-clearing-text-search="changeClearingTextSearch",
-    )
+          @search="filterDataClients",
-    base-modal(
+        )
-      v-model="showModal",
+        .flex.flex-col.h-full.table-container.w-full.mt-8.mb-3
-      title="Удалить клиента"
+          base-modal(v-model="showMedicalCard")
-    )
+            form-create-medical-card
-      client-table-delete-modal(
+          clients-table-header(:check="selectedCheck" :is-check="selectAll")
-        :close-modal="closeModal",
+          .flex.flex-col
-        :deleted-client-id="deletedClientId",
+            clients-table-row(
-        @delete-client="writeDeletedRowId"
+              v-for="client in dataClients",
-      )
+              :key="client.id",
+              :id="client.id",
+              :url="url",
+              :is-check="marked.includes(client.id)",
+              :check="selectedCheck",
+              :client="client",
+              :deleted-client-id="deletedRowId",
+              :update-data-client="updateDataClient",
+              :fetch-data-clients="fetchDataClients",
+              @delete-client="deleteClientHandler",
+              @recover-client="clearDeletedRowId",
+            )
+        client-table-pagination(
+          v-if="paginationInfo.length > 1"
+          :pagination-info="paginationInfo"
+          @previous-page="switchPreviousPage",
+          @next-page="switchNextPage",
+          @set-current-page="changeCurrentTablePage"
+        )
+        base-modal(
+          v-model="showModal",
+          title="Удалить клиента"
+        )
+          client-table-delete-modal(
+            :close-modal="closeModal",
+            :deleted-client-id="deletedClientId",
+            @delete-client="writeDeletedRowId"
+          )
 </template>
 
 <script>
@@ -56,6 +62,7 @@ import ClientTablePagination from "./ClientTablePagination.vue";
 import BaseModal from "@/components/base/BaseModal.vue";
 import ClientTableDeleteModal from "./ClientTableDeleteModal.vue";
 import FormCreateMedicalCard from "@/pages/clients/components/FormCreateMedicalCard";
+import BaseLoader from "@/components/Loader/BaseLoader.vue";
 export default {
   name: "ClientsTable",
   components: {
@@ -68,6 +75,7 @@ export default {
     BaseModal,
     ClientTableDeleteModal,
     FormCreateMedicalCard,
+    BaseLoader,
   },
   props: {
     openForm: Function,
@@ -80,7 +88,11 @@ export default {
     return {
       selectAll: false,
       marked: [],
-      dataClients: [],
+      dataClients: [
+        {
+          initialization: true,
+        },
+      ],
       currentTablePage: 1,
       limit: 14,
       clientsCount: 0,
@@ -97,6 +109,11 @@ export default {
       showMedicalCard: false,
     };
   },
+  computed: {
+    dataClientsPresence() {
+      return this.dataClients[0]?.initialization;
+    },
+  },
   methods: {
     updateDataClient() {
       if (this.textSearch) this.filteredClientsCount -= 1;
@@ -252,4 +269,18 @@ export default {
   &::-webkit-scrollbar-thumb
     border-radius: 8px
     background-color: var(--btn-blue-color)
+.table-enter-from
+  opacity: 0
+  transform: translateY(0px)
+  pointer-events: none
+.table-enter-active
+  transition: 0.3s ease
+.table-leave-to
+  opacity: 0
+  transform: translateY(0px)
+  pointer-events: none
+.table-leave-active
+  transition: 0.3s ease
+.table-move
+  transition: 0.3s ease
 </style>

src/pages/clients/components/ClientsTableRow.vue

@@ -354,7 +354,7 @@ export default {
     },
     async deleteClient() {
       await fetchWrapper.del(`general/person/${this.client.id}/delete/`);
-      this.addSuccessNotification("Клиент Успешно удален", "");
+      this.addSuccessNotification("Клиент успешно удален", "");
       this.handleUnFocusPopup();
     },
     addSuccessNotification(title, message) {