Revize 5aceeb68

Feature #8637 Návrh změn záznamů

application/controller/CreateChangeRequestController.php

@@ +1 @@
+<?php
+require "../model/DB.php";
+$DB = new DB();
+
+$result = $DB->createChangeRequest($_POST);

application/controller/GetChangeRequests.php

@@ +1 @@
+<?php
+require "../model/DB.php";
+$DB = new DB();
+
+$results = $DB->getChangeRequests();
+
+echo json_encode(count($results)==0 ? null : $results);

application/controller/RemoveChangeRequest.php

@@ +1 @@
+<?php
+require "../model/DB.php";
+$DB = new DB();
+
+$DB->removeChangeRequest($_POST["requestId"]);

application/controller/TableController.php

@@ -4 +4 @@
 require "../model/Word.php";
 require "../model/Lemma.php";
 $DB = new DB();
+session_start();
 
 $parArray = Array();
 $whereQuery = createWhereQuery($parArray);
@@ -73 +74 @@
         $array['positiondetail'] = $_POST['positiondetail'];
         $whereQuery .= " w.positiondetail = :positiondetail AND";
     }
-    if (array_key_exists("finished", $_POST) && $_POST['finished'] != "") {
-        $array['finished'] = $_POST['finished'];
-        $whereQuery .= " w.finished = :finished AND";
+    if (!array_key_exists("loggedIn", $_SESSION) || $_SESSION['loggedIn'] == false) {
+        $whereQuery .= " w.finished = true AND";
     }
     if (array_key_exists("manuscript", $_POST) && $_POST['manuscript'] != "") {
         $array['manuscript'] = Array();

application/model/DB.php

@@ -48 +48 @@
             if (array_key_exists("tag", $params)) {
                 $this->stmt->bindParam(':tag',$params['tag'], PDO::PARAM_STR);
             }
-            if (array_key_exists("finished", $params)) {
-                $this->stmt->bindParam(':finished',$params['finished']);
-            }
             if (array_key_exists("description2", $params)) {
                 $this->stmt->bindParam(':description2',$params['description2']);
             }
@@ -85 +82 @@
         return $this->stmt->fetchAll();
     }
 
+    function createChangeRequest($request) {
+        $this->stmt = $this->pdo->prepare('INSERT INTO changes (wordform_id, message) VALUES (:wordform_id, :message)');
+        $this->stmt->bindParam(':wordform_id', $request['wordform_id']);
+        $this->stmt->bindParam(':message',$request['message']);
+        $this->stmt->execute();
+        return $this->stmt->fetchAll();
+    }
+
+    function removeChangeRequest($requestId) {
+        $this->stmt = $this->pdo->prepare('DELETE FROM changes WHERE id = :requestId');
+        $this->stmt->bindParam(':requestId', $requestId);
+        $this->stmt->execute();
+        return $this->stmt->fetchAll();
+    }
+
+    function getChangeRequests() {
+        $this->stmt = $this->pdo->prepare('SELECT c.id as changeId, c.message, w.id as wordformId, w.word, l.lemma FROM changes as c left join dd_wordform as w on c.wordform_id = w.id left join dd_lemma as l on w.lemma_id = l.id');
+        $this->stmt->execute();
+        return $this->stmt->fetchAll();
+    }
+
     function updateUserRole($userId, $role) {
         $this->stmt = $this->pdo->prepare("UPDATE users SET role = :role WHERE id = :userId");
         $this->stmt->bindParam(':role', $role);
@@ -730 +748 @@
 
 // (D) DATABASE SETTINGS - CHANGE TO YOUR OWN!
 define('DB_HOST', 'localhost');
-define('DB_NAME', 'dalim2');
+define('DB_NAME', 'dalimil2');
 define('DB_CHARSET', 'utf8');
 define('DB_USER', 'postgres');
 define('DB_PASSWORD', 'a');

dbUsersUpgrade/users.txt

@@ -1 @@
---
--- PostgreSQL database dump
---
-
--- Dumped from database version 10.16
--- Dumped by pg_dump version 10.16
-
--- Started on 2021-04-10 22:53:56
-
-SET statement_timeout = 0;
-SET lock_timeout = 0;
-SET idle_in_transaction_session_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SELECT pg_catalog.set_config('search_path', '', false);
-SET check_function_bodies = false;
-SET xmloption = content;
-SET client_min_messages = warning;
-SET row_security = off;
-
-SET default_tablespace = '';
-
-SET default_with_oids = false;
-
---
--- TOC entry 203 (class 1259 OID 16487)
--- Name: users; Type: TABLE; Schema: public; Owner: postgres
---
-
-CREATE TABLE public.users (
-    id integer NOT NULL,
-    password character varying(100) NOT NULL,
-    username character varying NOT NULL,
-    role character varying NOT NULL
-);
-
-
-ALTER TABLE public.users OWNER TO postgres;
-
---
--- TOC entry 204 (class 1259 OID 16497)
--- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
---
-
-ALTER TABLE public.users ALTER COLUMN id ADD GENERATED ALWAYS AS IDENTITY (
-    SEQUENCE NAME public.users_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- TOC entry 2814 (class 0 OID 16487)
--- Dependencies: 203
--- Data for Name: users; Type: TABLE DATA; Schema: public; Owner: postgres
---
-
-COPY public.users (id, password, username, role) FROM stdin;
-4	$2y$10$liQbaSxcPykR4516JVQ/G.pDYu0niSOF7q/IhJlOrUqXsHwIwp/p2	admin	editor
-\.
-
-
---
--- TOC entry 2821 (class 0 OID 0)
--- Dependencies: 204
--- Name: users_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
---
-
-SELECT pg_catalog.setval('public.users_id_seq', 4, true);
-
-
---
--- TOC entry 2690 (class 2606 OID 16496)
--- Name: users username_unique; Type: CONSTRAINT; Schema: public; Owner: postgres
---
-
-ALTER TABLE ONLY public.users
-    ADD CONSTRAINT username_unique UNIQUE (username);
-
-
---
--- TOC entry 2692 (class 2606 OID 16491)
--- Name: users users_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
---
-
-ALTER TABLE ONLY public.users
-    ADD CONSTRAINT users_pkey PRIMARY KEY (id);
-
-
--- Completed on 2021-04-10 22:53:56
-
---
--- PostgreSQL database dump complete
---
-

dbupgrade/changes.sql

@@ +1 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 10.16
+-- Dumped by pg_dump version 10.16
+
+-- Started on 2021-04-24 21:33:05
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- TOC entry 205 (class 1259 OID 24745)
+-- Name: changes; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE public.changes (
+    id integer NOT NULL,
+    wordform_id integer NOT NULL,
+    message character varying NOT NULL
+);
+
+
+ALTER TABLE public.changes OWNER TO postgres;
+
+--
+-- TOC entry 206 (class 1259 OID 24753)
+-- Name: changes_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+ALTER TABLE public.changes ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
+    SEQUENCE NAME public.changes_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
+--
+-- TOC entry 2818 (class 0 OID 24745)
+-- Dependencies: 205
+-- Data for Name: changes; Type: TABLE DATA; Schema: public; Owner: postgres
+--
+
+COPY public.changes (id, wordform_id, message) FROM stdin;
+\.
+
+
+--
+-- TOC entry 2825 (class 0 OID 0)
+-- Dependencies: 206
+-- Name: changes_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
+--
+
+SELECT pg_catalog.setval('public.changes_id_seq', 1, true);
+
+
+--
+-- TOC entry 2696 (class 2606 OID 24752)
+-- Name: changes changes_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+--
+
+ALTER TABLE ONLY public.changes
+    ADD CONSTRAINT changes_pkey PRIMARY KEY (id);
+
+
+-- Completed on 2021-04-24 21:33:05
+
+--
+-- PostgreSQL database dump complete
+--
+

dbupgrade/users.sql

@@ +1 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 10.16
+-- Dumped by pg_dump version 10.16
+
+-- Started on 2021-04-10 22:53:56
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- TOC entry 203 (class 1259 OID 16487)
+-- Name: users; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE public.users (
+    id integer NOT NULL,
+    password character varying(100) NOT NULL,
+    username character varying NOT NULL,
+    role character varying NOT NULL
+);
+
+
+ALTER TABLE public.users OWNER TO postgres;
+
+--
+-- TOC entry 204 (class 1259 OID 16497)
+-- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+ALTER TABLE public.users ALTER COLUMN id ADD GENERATED ALWAYS AS IDENTITY (
+    SEQUENCE NAME public.users_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
+--
+-- TOC entry 2814 (class 0 OID 16487)
+-- Dependencies: 203
+-- Data for Name: users; Type: TABLE DATA; Schema: public; Owner: postgres
+--
+
+COPY public.users (id, password, username, role) FROM stdin;
+4	$2y$10$liQbaSxcPykR4516JVQ/G.pDYu0niSOF7q/IhJlOrUqXsHwIwp/p2	admin	editor
+\.
+
+
+--
+-- TOC entry 2821 (class 0 OID 0)
+-- Dependencies: 204
+-- Name: users_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
+--
+
+SELECT pg_catalog.setval('public.users_id_seq', 4, true);
+
+
+--
+-- TOC entry 2690 (class 2606 OID 16496)
+-- Name: users username_unique; Type: CONSTRAINT; Schema: public; Owner: postgres
+--
+
+ALTER TABLE ONLY public.users
+    ADD CONSTRAINT username_unique UNIQUE (username);
+
+
+--
+-- TOC entry 2692 (class 2606 OID 16491)
+-- Name: users users_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+--
+
+ALTER TABLE ONLY public.users
+    ADD CONSTRAINT users_pkey PRIMARY KEY (id);
+
+
+-- Completed on 2021-04-10 22:53:56
+
+--
+-- PostgreSQL database dump complete
+--
+