Merge pull request #144 from dderbentsov/UC-72

Сделала вывод ошибки в модальное окно, поправила get запросы на update, create, delite

src/pages/calendar/TheCalendar.vue

@@ -41,6 +41,7 @@
         :event-types="eventTypes"
         :owner-event="selectedEvent"
         :close-modal="changeShowModal"
+        @update-events="fetchEventsData"
       )
 </template>
 
@@ -153,7 +154,6 @@ export default {
       if (this.showModal === false) {
         this.setChangeFormState();
         this.clearSelectedEvent();
-        this.fetchEventsData();
       }
     },
   },

src/pages/calendar/components/CalendarDeleteModal.vue

@@ -40,6 +40,7 @@ export default {
   methods: {
     async deleteEvent() {
       await fetchWrapper.del(`registry/event/${this.ownerEvent.id}/delete/`);
+      this.$emit("update-events");
       this.closeModal();
     },
   },

src/pages/calendar/components/CalendarFormAddEvent.vue

@@ -305,7 +305,6 @@ export default {
         members: [this.findPerson(this.membersData, this.members, "person")],
       };
       await this.postCreateEvent(this.eventData);
-      this.clearForm();
       this.eventData = {};
     },
     async updateEventData() {
@@ -319,7 +318,6 @@ export default {
         members: [this.findPerson(this.membersData, this.members, "person")],
       };
       await this.postUpdateEvent(this.id, this.eventData);
-      this.clearForm();
       this.eventData = {};
     },
     clearForm() {
@@ -346,10 +344,19 @@ export default {
       return returnedData;
     },
     async postCreateEvent(event) {
-      await fetchWrapper.post("registry/event/create/", event);
+      const response = await fetchWrapper.post("registry/event/create/", event);
+      if (response.type && response.type === "validation_error") {
+        this.outputErrorMessage(response);
+      } else this.clearForm();
     },
     async postUpdateEvent(id, event) {
-      await fetchWrapper.post(`registry/event/${id}/update/`, event);
+      const response = await fetchWrapper.post(
+        `registry/event/${id}/update/`,
+        event
+      );
+      if (response.type && response.type === "validation_error") {
+        this.outputErrorMessage(response);
+      } else this.clearForm();
     },
     personId(object, field) {
       if (object) {
@@ -369,6 +376,11 @@ export default {
         return id;
       }
     },
+    outputErrorMessage(error) {
+      alert(
+        `error type: ${error.type}\nerror code: ${error.errors[0].code}\nerror detail: ${error.errors[0].detail}`
+      );
+    },
   },
   watch: {
     startDate: {

src/shared/fetchWrapper.js

@@ -15,7 +15,6 @@ function handleRequest(method, url, headers, attempts, body) {
       if (res) return res.json();
     })
     .catch((err) => {
-      console.log(err);
       return err;
     });
 }