From 5ae3373e3db8623da049e9a6ff65ff6b205e3a8e Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 28 Dec 2022 14:17:54 +0300
Subject: [PATCH] =?UTF-8?q?WIP=20=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20inputDate=20=D0=BD=D0=B0=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseInputDate.vue         |  1 +
 .../clients/components/ClientsTableRow.vue    | 29 ++++++++++++-------
 ...lBodyAge.vue => TableCellBodyBirthday.vue} | 22 ++++++++++----
 3 files changed, 36 insertions(+), 16 deletions(-)
 rename src/pages/clients/components/cells/{TableCellBodyAge.vue => TableCellBodyBirthday.vue} (51%)

diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue
index 04d2813..bc8921d 100644
--- a/src/components/base/BaseInputDate.vue
+++ b/src/components/base/BaseInputDate.vue
@@ -37,6 +37,7 @@ export default {
 
 <style lang="sass" scoped>
 .field
+  height: 100%
   display: flex
   align-items: center
   border: 1.5px solid var(--border-light-grey-color)
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 0fd3170..2ff174c 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -55,7 +55,7 @@
           :is-open-change="isOpenChange",
           :width="columnBody.find(el => el.name === 'fullName').width"
         )
-        table-cell-body-age(
+        table-cell-body-birthday(
           v-if="!rowOverlay",
           :value="dataClient",
           :is-open-change="isOpenChange",
@@ -120,7 +120,7 @@ import TableCellBodyEmail from "@/pages/clients/components/cells/TableCellBodyEm
 import TableCellBodyPhone from "@/pages/clients/components/cells/TableCellBodyPhone";
 import TableCellBodyPriority from "@/pages/clients/components/cells/TableCellBodyPriority";
 import TableCellBodyJobTitle from "@/pages/clients/components/cells/TableCellBodyJobTitle";
-import TableCellBodyAge from "@/pages/clients/components/cells/TableCellBodyAge";
+import TableCellBodyBirthday from "@/pages/clients/components/cells/TableCellBodyBirthday";
 import TableCellBodyName from "@/pages/clients/components/cells/TableCellBodyName";
 import ClientsActionPopup from "@/pages/clients/components/ClientsActionPopup";
 import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox";
@@ -141,7 +141,7 @@ export default {
     ClientsTableCheckbox,
     ClientsActionPopup,
     TableCellBodyName,
-    TableCellBodyAge,
+    TableCellBodyBirthday,
     TableCellBodyJobTitle,
     TableCellBodyPriority,
     TableCellBodyPhone,
@@ -243,19 +243,22 @@ export default {
       let clientName = `${this.client.last_name || ""} ${
         this.client.first_name || ""
       } ${this.client.patronymic || ""}`;
+      let age = this.dataClient.age
+        ? moment(this.dataClient.age).format("YYYY-MM-DD")
+        : null;
 
       if (!this.dataClient.fullName) this.dataClient.fullName = clientName;
       else if (this.dataClient.fullName !== clientName)
         data.full_name = this.dataClient.fullName;
-
-      if (this.dataClient.age !== this.client.birth_date && this.dataClient.age)
-        data.birth_date = this.dataClient.age;
-      else if (!this.dataClient.age && this.client.birth_date) {
+      if (age !== this.client.birth_date && age) data.birth_date = age;
+      else if (!age && this.client.birth_date) {
         this.addErrorNotification(
           "Некорректная дата рождения",
           "Пожалуйста, введите дату рождения корректно"
         );
-        this.dataClient.age = this.client.birth_date || "";
+        this.dataClient.age = this.client.birth_date
+          ? new Date(this.client.birth_date)
+          : null;
       }
       if (foundElement.id !== this.client.priority)
         data.priority = foundElement.id;
@@ -267,8 +270,10 @@ export default {
           "Некорректная дата рождения",
           "Дата рождения позже текущего дня"
         );
-        this.dataClient.age = this.client.birth_date || "";
-      } else if (!Object.keys(data).length === 0)
+        this.dataClient.age = this.client.birth_date
+          ? new Date(this.client.birth_date)
+          : null;
+      } else if (Object.keys(data).length !== 0)
         fetchWrapper
           .post(`general/person/${this.client.id}/update/`, {
             ...data,
@@ -691,7 +696,9 @@ export default {
             fullName: `${this.client.last_name || ""} ${
               this.client.first_name || ""
             } ${this.client.patronymic || ""}`,
-            age: this.client.birth_date || "",
+            age: this.client.birth_date
+              ? new Date(this.client.birth_date)
+              : null,
             priority: this.prioritySettings.settings.find(
               (el) =>
                 el.priority === this.client.priority ||
diff --git a/src/pages/clients/components/cells/TableCellBodyAge.vue b/src/pages/clients/components/cells/TableCellBodyBirthday.vue
similarity index 51%
rename from src/pages/clients/components/cells/TableCellBodyAge.vue
rename to src/pages/clients/components/cells/TableCellBodyBirthday.vue
index 4ea2aef..fee581c 100644
--- a/src/pages/clients/components/cells/TableCellBodyAge.vue
+++ b/src/pages/clients/components/cells/TableCellBodyBirthday.vue
@@ -2,27 +2,39 @@
   .flex.box-border.px-4.items-center.w-full.text-sm(
     :style="{ minWidth : width + 'px', maxWidth : width + 'px' }"
   )
-    span(v-if="!isOpenChange") {{value.age ? value.age.split("-").reverse().join(".") : ""}}
-    base-input-date.input.max-h-10(
+    span(v-if="!isOpenChange") {{ birthday }}
+    base-input-date.input.h-10(
       v-if="isOpenChange",
       @click.stop,
-      v-model:value="value.age"
+      v-model="value.age"
     )
 </template>
 
 <script>
 import BaseInputDate from "@/components/base/BaseInputDate";
+import * as moment from "moment/moment";
 export default {
-  name: "TableCellBodyAge",
+  name: "TableCellBodyBirthday",
   components: { BaseInputDate },
   props: {
     value: Object,
     width: Number,
     isOpenChange: Boolean,
   },
+  computed: {
+    birthday() {
+      return this.value.age
+        ? moment(this.value.age)
+            .format("YYYY-MM-DD")
+            .split("-")
+            .reverse()
+            .join(".")
+        : "";
+    },
+  },
 };
 </script>
 <style lang="sass" scoped>
 .input
-  border: 1.5px solid var(--border-light-grey-color)
+  background-color: var(--default-white)
 </style>