From 1126696bb9a8525a0898a9f267d9b4d6d6824c85 Mon Sep 17 00:00:00 2001
From: "ityurner02@mail.ru" <ityurner02@mail.ru>
Date: Sun, 21 May 2023 17:32:22 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=A04=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20=D1=82=D0=BE=D0=B6=D0=B5=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=8E=D1=82,=20=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BB=D1=81=D1=8F=20=D0=BE=D1=82=D1=87=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CatalogCollections.vue     | 246 ++++++++++++++++++
 .../src/components/CatalogFilms.vue           |   4 +-
 .../src/components/CatalogGenres.vue          |   2 +-
 Frontend/vue-project/src/main.js              |   4 +-
 data.mv.db                                    | Bin 86016 -> 77824 bytes
 .../DataBase/controller/CollectionDTO.java    |   2 +
 6 files changed, 254 insertions(+), 4 deletions(-)
 create mode 100644 Frontend/vue-project/src/components/CatalogCollections.vue

diff --git a/Frontend/vue-project/src/components/CatalogCollections.vue b/Frontend/vue-project/src/components/CatalogCollections.vue
new file mode 100644
index 0000000..a9edefd
--- /dev/null
+++ b/Frontend/vue-project/src/components/CatalogCollections.vue
@@ -0,0 +1,246 @@
+<script>
+	import 'axios';
+    import axios from "axios";
+    import Collection from "../models/Collection";
+    import Film from "../models/Film";
+    export default {
+        created() {
+            this.getCollections();
+            this.getFilms();
+        },
+        mounted() {
+            const addModal = document.getElementById('editModal');
+            addModal.addEventListener('shown.bs.modal', function () {
+            })
+            const openModalForAdd = document.getElementById('openModalForAdd');
+            openModalForAdd.addEventListener('shown.bs.modal', function () {
+            })
+        },
+        data() {
+            return{
+                collections: [],
+                URL: "http://localhost:8080/",
+                collection: new Collection(),
+                films: [],
+                selectedFilms: []
+            }
+        },
+        methods: {
+            getCollections(){
+                axios.get(this.URL + "collection")
+                    .then(response => {
+                        this.collections = response.data;
+                    })
+                    .catch(error => {
+                        console.log(error);
+                    });
+            },
+            addCollection(collection){
+                console.log(collection);
+                axios.post(this.URL + "collection", collection)
+                    .then(() => {
+                        this.getCollections();
+                        this.closeModal();
+                    })
+                    .catch(error => {
+                        console.log(error);
+                    });
+            },
+            deleteCollection(id){
+                axios.delete(this.URL + `collection/${id}`)
+                    .then(() =>{
+                        this.getCollections();
+                    })
+            },
+            editCollection(collection){
+                axios.put(this.URL + `collection/${collection.id}`, collection)
+                    .then(() =>{
+                        const index = this.collections.findIndex((s) => s.id === collection.id);
+                        if (index !== -1) {
+                            this.collections[index] = { ...collection };
+                        }
+                        this.closeModal();
+                        this.getCollections();
+                    })
+                this.closeModal();
+            },
+            openModalForAdd(status, collection = null) {
+                if (status === "create") {
+                    this.collection = new Collection();
+                    this.collection.status = "create";
+                } else if (status === "edit" && collection) {
+                    this.collection = { ...collection };
+                    this.collection.status = "edit";
+                }
+                this.selectedFilms = this.collection.filmIds;
+                document.getElementById("openModalForAdd").style.display = "block";
+            },
+            closeModalForAdd() {
+                document.getElementById("openModalForAdd").style.display = "none";
+                this.selectedFilms = [];
+                this.collection = new Collection();
+            },
+            openModal(status, collection = null) {
+            if (status === "create") {
+                this.collection = new Collection();
+                this.collection.status = "create";
+            } else if (status === "edit" && collection) {
+                this.collection = { ...collection };
+                this.collection.status = "edit";
+            }
+            document.getElementById("editModal").style.display = "block";
+            },
+            closeModal() {
+                document.getElementById("editModal").style.display = "none";
+            },
+            getFilms(){
+                axios.get(this.URL + "film")
+                    .then(response => {
+                        this.films = response.data;
+                        console.log(response.data);
+                    })
+                    .catch(error => {
+                        console.log(error);
+                    });
+            },
+
+            addCollectionFilm(id) {
+                let filmId = document.getElementById('films').value;
+                axios
+                    .post(this.URL + `collection/add_film/${id}?film_id=${filmId}`)
+                    .then(() => {
+                        this.closeModalForAdd();
+                        this.getCollections();
+                    })
+                    .catch((error) => {
+                        console.log(error);
+                    });
+            },
+            delCollectionFilm(id) {
+                let filmId = document.getElementById('films').value;
+                axios
+                    .delete(this.URL + `collection/del_film/${id}?film_id=${filmId}`)
+                    .then(() => {
+                        this.closeModalForAdd();
+                        this.getCollections();
+                    })
+                    .catch((error) => {
+                        console.log(error);
+                    });
+            },
+            itemsGenres(filmIds) {
+                let result = [];
+                if (typeof filmIds === 'undefined') {
+                    return;
+                }
+                this.films.forEach(film => {
+                    for (let i = 0; i < filmIds.length; i++) {
+                        if (film.id === filmIds[i]) {
+                            result.push(film);
+                        }
+                    }
+                });
+                return result;
+            }
+        }
+    }
+</script>
+<template>
+    <div class="container mt-4">
+        <h1 class="text-center text-danger mb-4">Коллекции</h1>
+        <button class="btn btn-success mr-2" @click="openModal('create')">Добавить</button>
+        <table class="table text-light">
+            <thead>
+            <tr>
+                <th>Название</th>
+                <th></th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-for="col in collections" :key="col.id">
+                <td>{{ col.name }}</td>
+                <td>
+                    <td>
+                        <button class="btn btn-warning mr-2" @click="openModal('edit', col)">Изменить</button>
+                    </td>
+                    <td>
+                        <button class="btn btn-danger" @click="deleteCollection(col.id)">Удалить</button>
+                    </td>
+                    <td>
+                        <button class="btn btn-success mr-2" @click="openModalForAdd('edit', col);">Добавить фильмы</button>
+                    </td>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+<!--Форма для создания коллекций-->
+    <div class="modal" tabindex="-1" id="editModal">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Коллекция</h5>
+                </div>
+                <div class="modal-body">
+                    <form>
+                        <div class="form-group">
+                            <label for="name">Название:</label>
+                            <input type="text" class="form-control" id="name" name="name" v-model="collection.name">
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="editModal" @click="closeModal()">Закрыть</button>
+                    <button type="button" class="btn btn-primary" v-if="collection.status === 'create'" @click="addCollection(collection)">Создать</button>
+                    <button type="button" class="btn btn-primary" v-else @click="editCollection(collection)">Сохранить</button>
+                </div>
+            </div>
+        </div>
+    </div>
+<!--Форма для привязки коллекции и фильма   -->
+    <div class="modal" tabindex="-1" id="openModalForAdd">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Добавление фильмов</h5>
+                </div>
+                <div class="modal-body">
+                    <form>
+                        <div class="form-group">
+                            <label for="name">Название:</label>
+                            <input readonly type="text" class="form-control" id="name" name="name" v-model="collection.name">
+                        </div>
+                        <div class="form-group">
+                            <label for="name">Фильмы:</label>
+                            <ul class="list-group">
+                                <li class="list-group-item" v-for="film in itemsGenres(this.collection.filmIds)" :key="film.id">
+                                    <div>
+                                        <label>{{ film.name }}</label>
+                                    </div>
+                                </li>
+                            </ul>
+                            <div class="mt-4">
+                            <label>Выберите фильм</label>
+                            <select class="form-select" id="films" required>
+                                <option v-for="film in this.films"
+                                    :value="film.id">
+                                    {{ film.name }}
+                                </option>
+                            </select>
+                            </div>
+                        </div>
+                        <div class="d-flex justify-content-between mt-4">
+                            <button class="btn btn-success" type="button" id="addFilmButton"
+                            @click="addCollectionFilm(this.collection.id)">Добавить</button>
+                            <button class="btn btn-danger" type="button" id="delFilmButton"
+                            @click="delCollectionFilm(this.collection.id)">Удалить</button>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="editModal" @click="closeModalForAdd()">Закрыть</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/Frontend/vue-project/src/components/CatalogFilms.vue b/Frontend/vue-project/src/components/CatalogFilms.vue
index b9a40c1..827fa9f 100644
--- a/Frontend/vue-project/src/components/CatalogFilms.vue
+++ b/Frontend/vue-project/src/components/CatalogFilms.vue
@@ -2,7 +2,7 @@
 	import 'axios';
     import axios from "axios";
     import Film from "../models/Film";
-    import Group from "../models/Genre";
+    import Genre from "../models/Genre";
     export default {
         created() {
             this.getFilms();
@@ -131,7 +131,7 @@
 </script>
 <template>
 <div class="container mt-4">
-        <h1 class="text-center mb-4">Фильмы</h1>
+        <h1 class="text-center text-danger mb-4">Фильмы</h1>
         <button class="btn btn-success mr-2" @click="openModal('create')">Добавить</button>
         <table class="table text-light">
             <thead>
diff --git a/Frontend/vue-project/src/components/CatalogGenres.vue b/Frontend/vue-project/src/components/CatalogGenres.vue
index 75ba887..2412d6e 100644
--- a/Frontend/vue-project/src/components/CatalogGenres.vue
+++ b/Frontend/vue-project/src/components/CatalogGenres.vue
@@ -83,7 +83,7 @@
 
 <template>
 <div class="container mt-4">
-    <h1 class="text-center mb-4">Жанры</h1>
+    <h1 class="text-center text-danger mb-4">Жанры</h1>
     <button class="btn btn-success mr-2" @click="openModal('create')">Добавить</button>
     <table class="table text-light">
                 <thead>
diff --git a/Frontend/vue-project/src/main.js b/Frontend/vue-project/src/main.js
index 3183483..5c568ad 100644
--- a/Frontend/vue-project/src/main.js
+++ b/Frontend/vue-project/src/main.js
@@ -4,12 +4,14 @@ import App from './App.vue'
 import Index from './components/Index.vue'
 import CatalogGenres from './components/CatalogGenres.vue'
 import CatalogFilms from './components/CatalogFilms.vue'
+import CatalogCollections from './components/CatalogCollections.vue'
 
 const routes = [
     { path: '/', redirect: '/index' },
     { path: '/index', component: Index},
     { path: '/catalogs/genres', component: CatalogGenres},
-    { path: '/catalogs/films', component: CatalogFilms}
+    { path: '/catalogs/films', component: CatalogFilms},
+    { path: '/catalogs/collections', component: CatalogCollections}
 ]
 
 const router = createRouter({
diff --git a/data.mv.db b/data.mv.db
index a570385e19770c8d6e6c628b9c463015ba40c671..482449d257d8736fc44ae74a9a23e0748784de9e 100644
GIT binary patch
literal 77824
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

delta 7487
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
IU}K^G0O&8SYXATM

diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionDTO.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionDTO.java
index 61a25cf..b58d69d 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionDTO.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionDTO.java
@@ -27,4 +27,6 @@ public class CollectionDTO {
     public List<Long> getFilmIds(){
         return filmIds;
     }
+    public void setId(long id){ this.id = id; }
+    public void setName(String name){ this.name = name; }
 }