diff --git a/bills.sql b/bills.sql new file mode 100644 index 0000000..173a308 --- /dev/null +++ b/bills.sql @@ -0,0 +1,180 @@ +-- phpMyAdmin SQL Dump +-- version 4.9.7deb1 +-- https://www.phpmyadmin.net/ +-- +-- Host: localhost:3306 +-- Generation Time: Aug 05, 2021 at 02:05 PM +-- Server version: 8.0.26-0ubuntu0.21.04.3 +-- PHP Version: 7.4.16 + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET AUTOCOMMIT = 0; +START TRANSACTION; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8mb4 */; + +-- +-- Database: `bills` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `Books` +-- + +CREATE TABLE `Books` ( + `book_id` int NOT NULL, + `owner_id` int DEFAULT NULL, + `account` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `name` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `adress` varchar(255) COLLATE utf8_bin DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8_bin; + +-- +-- Dumping data for table `Books` +-- + +INSERT INTO `Books` (`book_id`, `owner_id`, `account`, `name`, `adress`) VALUES +(8, 6, '00000295', 'Газ', 'Ул. Шевченко'), +(10, 6, '149', 'Вода', 'Ул. Шевченко'), +(23, 21, 'хз', 'Свет', 'Шевченко'), +(24, 21, 'хз', 'Свет', 'Шевченко'), +(36, 19, '10810', 'Водоснабжение', 'Титова'), +(37, 19, '6263', 'Газоснабжение', 'Титова'), +(38, 19, '770333066', 'Электроенегрия', 'Титова'), +(42, 19, '1', 'Кавун', '1'), +(43, 19, '1', 'Дыня', '1'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `Receipts` +-- + +CREATE TABLE `Receipts` ( + `receipt_id` int NOT NULL, + `book_id` int DEFAULT NULL, + `start_date` date DEFAULT NULL, + `final_date` date DEFAULT NULL, + `start_num` int DEFAULT NULL, + `final_num` int DEFAULT NULL, + `rate` float DEFAULT NULL, + `comment` varchar(255) COLLATE utf8_bin DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8_bin; + +-- +-- Dumping data for table `Receipts` +-- + +INSERT INTO `Receipts` (`receipt_id`, `book_id`, `start_date`, `final_date`, `start_num`, `final_num`, `rate`, `comment`) VALUES +(47, 8, '2021-07-19', '2021-08-16', 1111, 1121, 8.99, 'Благодарю'), +(57, 24, '2021-06-21', '2021-07-21', 4200, 4300, 1.68, ''), +(90, 37, '2021-05-01', '2021-05-31', 2422, 2429, 8.99, ''), +(91, 37, '2021-06-01', '2021-06-30', 2429, 2436, 8.99, ''), +(92, 38, '2021-05-01', '2021-05-31', 18688, 18965, 1.68, ''), +(94, 38, '2021-06-01', '2021-06-30', 18965, 19260, 1.68, ''), +(96, 36, '2021-05-01', '2021-05-31', 1064, 1074, 2.17, ''), +(97, 36, '2021-06-01', '2021-06-30', 1074, 1086, 2.17, ''), +(101, 37, '2021-07-01', '2021-07-31', 2436, 2443, 8.99, ''), +(106, 38, '2021-07-01', '2021-07-31', 19260, 19550, 1.68, ''), +(108, 8, '2021-08-03', '2021-06-30', 12, 18, 8, ''), +(109, 10, '2021-06-01', '2021-06-30', 12, 15, 22, ''), +(110, 42, '2021-07-01', '2021-07-31', 0, 100, 3.99, ''), +(111, 43, '2021-06-01', '2021-06-30', 0, 100, 4, ''); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `Users` +-- + +CREATE TABLE `Users` ( + `user_id` int NOT NULL, + `create_time` datetime DEFAULT CURRENT_TIMESTAMP, + `username` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `email` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `password` varchar(128) COLLATE utf8_bin DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8_bin; + +-- +-- Dumping data for table `Users` +-- + +INSERT INTO `Users` (`user_id`, `create_time`, `username`, `email`, `password`) VALUES +(6, '2021-07-19 13:32:44', 'tatyana', 'email@gmail.com', 'password hash'), +(19, '2021-07-20 21:33:35', 'Данил', 'dr.juniorf@gmail.com', '$2y$10$pvUpTNEwt$@#@35sdfAwtvhSJcCSMcSsadfhg..UK.GnTd6vhzGg6ZJsdfhAigJU7GjjPqpEkzuB3G'), +(21, '2021-07-21 11:47:47', 'Aliona', 'lola.lolina96@gmail.com', '$2y$10$Dbxo42/yRcikL1TudfsjdfgjASDFX2tSK.SFG.aTasdfSBRqmTEjKU5nVkASDFHSDGJuYTeFLywV/Z3dY4ca'); + +-- +-- Indexes for dumped tables +-- + +-- +-- Indexes for table `Books` +-- +ALTER TABLE `Books` + ADD PRIMARY KEY (`book_id`), + ADD KEY `owner_id` (`owner_id`); + +-- +-- Indexes for table `Receipts` +-- +ALTER TABLE `Receipts` + ADD PRIMARY KEY (`receipt_id`), + ADD KEY `Receipts_ibfk_1` (`book_id`); + +-- +-- Indexes for table `Users` +-- +ALTER TABLE `Users` + ADD PRIMARY KEY (`user_id`), + ADD UNIQUE KEY `email` (`email`); + +-- +-- AUTO_INCREMENT for dumped tables +-- + +-- +-- AUTO_INCREMENT for table `Books` +-- +ALTER TABLE `Books` + MODIFY `book_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=44; + +-- +-- AUTO_INCREMENT for table `Receipts` +-- +ALTER TABLE `Receipts` + MODIFY `receipt_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=112; + +-- +-- AUTO_INCREMENT for table `Users` +-- +ALTER TABLE `Users` + MODIFY `user_id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=22; + +-- +-- Constraints for dumped tables +-- + +-- +-- Constraints for table `Books` +-- +ALTER TABLE `Books` + ADD CONSTRAINT `Books_ibfk_1` FOREIGN KEY (`owner_id`) REFERENCES `Users` (`user_id`) ON DELETE CASCADE; + +-- +-- Constraints for table `Receipts` +-- +ALTER TABLE `Receipts` + ADD CONSTRAINT `Receipts_ibfk_1` FOREIGN KEY (`book_id`) REFERENCES `Books` (`book_id`) ON DELETE CASCADE; +COMMIT; + +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/book.php b/book.php new file mode 100644 index 0000000..55e173c --- /dev/null +++ b/book.php @@ -0,0 +1,95 @@ + 0) { + + while($row = mysqli_fetch_assoc($book_data)) { + $book_name = $row['name']; + $book_adress = $row['adress']; + } + } + + #Validate ownership + $link_user_id = $_GET['user_id']; + $session_user_id = $_SESSION['user_id']; + + if ($link_user_id != $session_user_id) { + header("Location: index.php"); + } + +?> + + + + + + +
+ + На главную + +

+

+ +
+ + + +
+ + +
+ + +
+

Запись №'.$receipt_num.'

+

'.date("d.m.Y", strtotime($row[1])).' - '.date("d.m.Y", strtotime($row[2])).'

+ Посмотреть / Изменить +
+
'; + } + } + + + ?> + + + +
+ + + + + + \ No newline at end of file diff --git a/connection.php b/connection.php new file mode 100644 index 0000000..244ac57 --- /dev/null +++ b/connection.php @@ -0,0 +1,12 @@ + + + + + + + +
+
+ +

Создать книжку

+ +
* обязательное поле
+
+ + +
+
+ + +
+
+ + +
+
+ + +

+ + Назад +
+
+ + + + \ No newline at end of file diff --git a/css/book.css b/css/book.css new file mode 100644 index 0000000..79aa492 --- /dev/null +++ b/css/book.css @@ -0,0 +1,74 @@ +/* ****CONTENT**** */ +.content { + padding: 20px 20px 20px 20px; + + min-height: calc(100% - 242px); + + text-align: center; +} + + +h2 { + margin-bottom: 0px; +} + +h3 { + margin-bottom: 0px; +} + +.card-wrapper { + padding: 20px 0px 20px 0px; +} + +.card { + background-color: #D3DCE3; + + width: 300px; + height: 200px; + + display: inline-block; + vertical-align: top; + + margin: 1rem; + + border: 1px solid #aaa; + border-radius: 3px; + box-shadow: 1px 1px 2px #fff inset; +} + +/* FILLED CARD */ +.card-content-wrapper { + position: relative; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +/* EMPTY CARD */ +.add-btn { + background-color: #235A81; + + width: 60px; + height: 60px; + + border: 1px solid #235A81; + border-radius: 30px; + + position: relative; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + display: grid; + text-align: center; + align-items: center; + + text-decoration: none; + color: #fff; + text-shadow: 0.5px 0.5px 0.5px #444; + font-size: 35px; +} + +.add-btn:hover { + background-color: #1f4f72; +} \ No newline at end of file diff --git a/css/createbook.css b/css/createbook.css new file mode 100644 index 0000000..e39e1ab --- /dev/null +++ b/css/createbook.css @@ -0,0 +1,85 @@ +.content { + padding: 20px 20px 20px 20px; + + height: calc(100% - 242px); +} + +.form { + background-color: #D3DCE3; + min-width: 300px; + max-width: 400px; + + position: relative; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + padding: 5px 20px 20px 20px; + + border: 1px solid #aaa; + border-radius: 3px; + + box-shadow: 1px 1px 2px #fff inset; + + text-align: center; + + z-index: 99; +} + +.form_title { + text-align: center; +} + +.input { + transition-duration: 0.3s; + + background-color: #fff; + + margin: 10px 0px 5px 0px; + width: 100%; + height: 30px; + + outline: none; + border: 1px solid #aaa; + border-radius: 3px; + + font-size: 15px; +} + +.input:hover, .input:focus { + transition-duration: 0.3s; + + outline: none; + box-shadow: 0px 0.1px 2px 0.1px #444444; +} + +.submit_button { + background-color: #235A81; + + margin: 5px 0px 0px 0px; + width: 100%; + height: 32px; + + border: 1px solid #aaa; + border-radius: 3px; + + cursor: pointer; + + color: #fff; + text-shadow: 0.5px 0.5px 0.5px #444; + font-size: 15px; +} + +.submit_button:hover { + background-color: #1f4f72; +} + +.link { + color: #235A81; +} + +.error { + margin: 0px; + + color: #235A81; +} \ No newline at end of file diff --git a/css/index.css b/css/index.css new file mode 100644 index 0000000..6b591ad --- /dev/null +++ b/css/index.css @@ -0,0 +1,69 @@ +/* ****CONTENT**** */ +.content { + padding: 20px 20px 20px 20px; + + text-align: center; + + min-height: calc(100% - 242px); +} + +.card { + background-color: #D3DCE3; + + width: 300px; + height: 500px; + + display: inline-block; + vertical-align: top; + + margin: 1rem; + + border: 1px solid #aaa; + border-radius: 3px; + box-shadow: 1px 1px 2px #fff inset; +} + +.card.dragging { + opacity: 0.5; +} + +/* FILLED CARD */ +.card-content-wrapper { + position: relative; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +/* EMPTY CARD */ +.add-btn { + background-color: #235A81; + + width: 60px; + height: 60px; + + border: 1px solid #235A81; + border-radius: 30px; + + position: relative; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + display: grid; + text-align: center; + align-items: center; + + text-decoration: none; + color: #fff; + text-shadow: 0.5px 0.5px 0.5px #444; + font-size: 35px; +} + +.add-btn:hover { + background-color: #1f4f72; +} + +.link { + color: #235A81; +} \ No newline at end of file diff --git a/css/profile.css b/css/profile.css new file mode 100644 index 0000000..a817bca --- /dev/null +++ b/css/profile.css @@ -0,0 +1,148 @@ +.form { + /*background-color: #D3DCE3;*/ + min-width: 200px; + max-width: 400px; + + position: relative; + left: 50%; + transform: translate(-50%, 0%); + + padding: 5px 20px 20px 20px; + margin: 0px; + + /*border: 1px solid #aaa; + border-radius: 3px; + + box-shadow: 1px 1px 2px #fff inset;*/ + + z-index: 99; +} + +.title { + padding: 0; +} + +.input { + transition-duration: 0.3s; + + background-color: #fff; + + margin: 10px 0px 5px 0px; + width: 75%; + height: 30px; + + outline: none; + border: 1px solid #aaa; + border-radius: 3px; + + font-size: 15px; +} + +.input:hover, .input:focus { + transition-duration: 0.3s; + + outline: none; + box-shadow: 0px 0.1px 2px 0.1px #444444; +} + +.submit_button { + background-color: #235A81; + + margin: 10px 0px 0px 0px; + width: 77%; + height: 30px; + + border: 1px solid #aaa; + border-radius: 3px; + + cursor: pointer; + + color: #fff; + text-shadow: 0.5px 0.5px 0.5px #444; + font-size: 15px; +} + +.submit_button:hover { + background-color: #1f4f72; +} + +.btn { + display: inline-block; + + background-color: #235A81; + + padding: 20px 40px 20px 40px; + margin: 10px 5px 10px 5px; + + border-radius: 30px; + + text-decoration: none; + font-size: 15px; + text-shadow: 0.5px 0.5px 0.5px #444; + font-weight: bolder; + color: #fff; +} + +.btn:hover { + background-color: #1f4f72; +} + +.link { + color: #235A81; +} + +.error { + margin: 0px; + + color: #235A81; +} + +.content { + width: 100%; +} + +.stats { + height: auto; + + padding: 0px 20px 5px 20px; + + text-align: center; + + display: grid; + justify-content: center; +} + +.chart_div { + text-align: left; + + width: 90vw; + height: 400px; +} + +.chpwd { + height: 400px; + + display: grid; + align-content: center; + text-align: center; +} + +.settings { + height: 300px; + + display: grid; + align-content: center; + justify-content: center; + text-align: center; +} + +hr { + color: #444; + border-radius: 50%; +} + +@media screen and (max-width: 450px) { + .chart_div { + height: 300px; + } +} \ No newline at end of file diff --git a/css/receipt.css b/css/receipt.css new file mode 100644 index 0000000..1e92ce5 --- /dev/null +++ b/css/receipt.css @@ -0,0 +1,105 @@ +.content { + padding: 20px 20px 20px 20px; + + height: fit-content; + + text-align: center; +} + +.form { + background-color: #D3DCE3; + min-width: 300px; + max-width: 400px; + + position: relative; + left: 50%; + transform: translate(-50%, 0%); + + padding: 5px 20px 20px 20px; + margin: 15px 0px 15px 0px; + + border: 1px solid #aaa; + border-radius: 3px; + + box-shadow: 1px 1px 2px #fff inset; + + z-index: 99; +} + +.input-container { + width: 300px; + margin: 0 auto; +} + +.input-label { + text-align: left; + margin: 0px 0px 5px 6px; +} + +.input { + transition-duration: 0.3s; + + background-color: #fff; + + margin: 0px 0px 0px 0px; + width: 135px; + height: 30px; + + outline: none; + border: 1px solid #aaa; + border-radius: 3px; + + font-size: 15px; + + -webkit-validation-bubble-message: none; +} + +.num-input { + width: 9.8ch; +} + +.comment { + width: 285px; + height: 50px; + + resize: none; +} + +.input:hover, .input:focus { + transition-duration: 0.3s; + + outline: none; + box-shadow: 0px 0.1px 2px 0.1px #444444; +} + +.submit_button { + background-color: #235A81; + + margin: 0px; + min-width: 295px; + height: 32px; + + border: 1px solid #aaa; + border-radius: 3px; + + cursor: pointer; + + color: #fff; + text-shadow: 0.5px 0.5px 0.5px #444; + font-size: 15px; +} + +.submit_button:hover { + background-color: #1f4f72; +} + +.link { + color: #235A81; +} + +.error { + text-align: left; + color: #235A81; + + margin: 5px 0px 0px 6px; +} \ No newline at end of file diff --git a/css/sign.css b/css/sign.css new file mode 100644 index 0000000..fe5f16a --- /dev/null +++ b/css/sign.css @@ -0,0 +1,79 @@ +body { + padding: 0px 15px 0px 15px; + + width: calc(100% - 30px) +} + +.form { + background-color: #D3DCE3; + min-width: 300px; + max-width: 400px; + + position: relative; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + padding: 5px 20px 20px 20px; + + border: 1px solid #aaa; + border-radius: 3px; + + box-shadow: 1px 1px 2px #fff inset; + + text-align: center; +} + +.input { + transition-duration: 0.3s; + + background-color: #fff; + + margin: 10px 0px 5px 0px; + width: 100%; + height: 30px; + + outline: none; + border: 1px solid #aaa; + border-radius: 3px; + + font-size: 15px; +} + +.input:hover, .input:focus { + transition-duration: 0.3s; + + outline: none; + box-shadow: 0px 0.1px 2px 0.1px #444444; +} + +.submit_button { + background-color: #235A81; + + margin: 5px 0px 0px 0px; + width: 100%; + height: 30px; + + border: 1px solid #aaa; + border-radius: 3px; + + cursor: pointer; + + color: #fff; + text-shadow: 0.5px 0.5px 0.5px #444; + font-size: 15px; +} + +.submit_button:hover { + background-color: #1f4f72; +} + +.link { + color: #235A81; +} + +.error { + margin: 0px; + + color: #235A81; +} \ No newline at end of file diff --git a/elements/footer.php b/elements/footer.php new file mode 100644 index 0000000..b3ce501 --- /dev/null +++ b/elements/footer.php @@ -0,0 +1,34 @@ + + + \ No newline at end of file diff --git a/elements/header.php b/elements/header.php new file mode 100644 index 0000000..208aafd --- /dev/null +++ b/elements/header.php @@ -0,0 +1,151 @@ + + +
+ + +
\ No newline at end of file diff --git a/functions.php b/functions.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/functions.php @@ -0,0 +1 @@ + + + + + + + + + Сайт + + + + + \ No newline at end of file diff --git a/img/icon.png b/img/icon.png new file mode 100644 index 0000000..874470e Binary files /dev/null and b/img/icon.png differ diff --git a/img/logo.png b/img/logo.png new file mode 100644 index 0000000..1d31d7e Binary files /dev/null and b/img/logo.png differ diff --git a/index.php b/index.php new file mode 100644 index 0000000..3037ca6 --- /dev/null +++ b/index.php @@ -0,0 +1,59 @@ + + + + + + + + +
+ + 0) { + + foreach (mysqli_fetch_all($userdata) as $row) { + array_push($books, $row); + } + + foreach ($books as $book) { + $book_id = $book[0]; + + echo '
+
+

'.$book[1].'

+

'.$book[2].'

+

Счёт '.$book[3].'

+ Подробнее

+ Удалить +
+
'; + } + } + + #print_r($books); + ?> + +
+ + +
+ +
+ + + + \ No newline at end of file diff --git a/js/dragndrop.js b/js/dragndrop.js new file mode 100644 index 0000000..f7e2661 --- /dev/null +++ b/js/dragndrop.js @@ -0,0 +1,38 @@ +const draggables = document.querySelectorAll('.card') +const container = document.querySelector('.content') + +draggables.forEach(draggable => { + draggable.addEventListener('dragstart', () => { + draggable.classList.add('dragging'); + }) + + draggable.addEventListener('dragend', () => { + draggable.classList.remove('dragging') + }) +}) + +container.addEventListener('dragover', e => { + e.preventDefault() + const afterElement = getDragAfterElement(container, e.clientX) + console.log(afterElement) + const draggable = document.querySelector('.dragging') + if (afterElement == null) { + container.appendChild(draggable) + } else { + container.insertBefore(draggable, afterElement) + } +}) + +function getDragAfterElement (container, x) { + const draggableElements = [...container.querySelectorAll('.draggable:not(.dragging)')] + + draggableElements.reduce((closest, child) => { + const box = child.getBoundingClientRect() + const offset = x - box.right - box.width / 2 + if (offset < 0 && offset > closest.offset) { + return { offset: offset, element: child} + } else { + return closest + } + }, { offset: Number.NEGATIVE_INFINITY }).element +} \ No newline at end of file diff --git a/login.php b/login.php new file mode 100644 index 0000000..4580d36 --- /dev/null +++ b/login.php @@ -0,0 +1,79 @@ + 0) { + + while($row = mysqli_fetch_assoc($userdata)) { + $dbuser_id = $row['user_id']; + $dbusername = $row['username']; + $dbemail = $row['email']; + $dbpassword_hashed = $row['password']; + } + + if (password_verify($password, $dbpassword_hashed)) { + $_SESSION['loggedin'] = true; + $_SESSION['user_id'] = $dbuser_id; + $_SESSION['username'] = $dbusername; + $_SESSION['email'] = $dbemail; + + header("Location: index.php"); + + mysqli_close($conn); + } else { + $passwordErr = "Неправильный пароль"; + } + } else { + + $emailErr = "Почта не зарегестрирована"; + } + } +?> + + + + +
+ +

Войти

+ +
* обязательное поле
+
+ + +
+
+ + +
+
+ + + +

У вас ещё нету аккаунта? Создать аккаунт

+
+ + \ No newline at end of file diff --git a/logout.php b/logout.php new file mode 100644 index 0000000..2836d2c --- /dev/null +++ b/logout.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/profile.php b/profile.php new file mode 100644 index 0000000..9931cc3 --- /dev/null +++ b/profile.php @@ -0,0 +1,226 @@ + 0) { + + while($row = mysqli_fetch_array($result)) { + $dbpassword_hashed = $row['password']; + } + } + + #Validate new password + $password = $_POST['pwd']; + $new_password = $_POST['npwd']; + $confirm_new_password = $_POST['cnpwd']; + + if ($new_password != $confirm_new_password) { + $confirm_passwordErr = 'Пароли не совпадают'; + } + + if (mb_strlen($new_password) < 8) { + $confirm_passwordErr = "Используйте больше 8 символов"; + } + + if (empty($new_password)) { + $confirm_passwordErr = "Вы не ввели пароль"; + } + + if (!password_verify($password, $dbpassword_hashed)) { + $passwordErr = "Вы ввели неправильный пароль"; + } + + #Set new password + if ($confirm_passwordErr == NULL && $passwordErr == NULL) { + + $password_hashed = password_hash($new_password, PASSWORD_DEFAULT); + $query = "UPDATE Users SET password = '$password_hashed' WHERE (user_id = '$session_user_id')"; + + if (mysqli_query($conn, $query)) { + header("Location: logout.php"); + mysqli_close($conn); + } else { + echo mysqli_errno($conn) . " : " . mysqli_error($conn); + } + } + + } + } + + include_once('head.php'); + + ####Get data to make graphs#### + $book_info = array(); + + #Get user's books + $book_ids = $book_names = array(); + + $query = "SELECT book_id, name FROM Books WHERE owner_id = '$session_user_id'"; + $result = mysqli_query($conn, $query); + + if (mysqli_num_rows($result) > 0) { + + while($row = mysqli_fetch_array($result)) { + + array_push($book_ids, $row['book_id']); + array_push($book_names, $row['name']); + } + } + + #Get user's boooks receipts into $book_info array + + $start_dates_all = $final_dates_all = $start_nums_all = $final_nums_all = $rates_all = $start_dates = $final_dates = $start_nums = $final_nums = $rates = array(); + + $curr_id = NULL; + $curr_num = -1; + + for ($i=0; $i < count($book_ids); $i++) { + + $query = "SELECT start_date, final_date, start_num, final_num, rate FROM Receipts WHERE book_id = '$book_ids[$i]' ORDER BY start_date LIMIT 100"; + $result = mysqli_query($conn, $query); + + if (mysqli_num_rows($result) > 0) { + + while($row = mysqli_fetch_array($result)) { + + if (date(strtotime($row['final_date'])) > date(strtotime('-2 month'))) { + + array_push($start_dates_all, $row['start_date']); + array_push($final_dates_all, $row['final_date']); + array_push($start_nums_all, $row['start_num']); + array_push($final_nums_all, $row['final_num']); + array_push($rates_all, $row['rate']); + + if ($curr_id != $book_ids[$i]) { + + $curr_id = $book_ids[$i]; + $curr_num++; + + array_push($book_info, array($book_ids[$i], $book_names[$i], array(array($row['start_date'], $row['final_date'], $row['start_num'], $row['final_num'], $row['rate'])))); + } else if ($curr_id == $book_ids[$i]) { + + array_push($book_info[$curr_num][2], array($row['start_date'], $row['final_date'], $row['start_num'], $row['final_num'], $row['rate'])); + } + } + } + } + } + + #$print_r($book_info); + +?> + + + + + + + + + + + + + +
+ +
+ +

Статистика

+ +
+ +
+ +
+ +
+ +
+ +

Изменить пароль

+ + +
+ + +
+ + +
+ + + +
+ +
+ +
+ +
+ +

Управление аккаунтом

+ + Удалить аккаунт + +
+ +
+ + + + \ No newline at end of file diff --git a/receipt.js b/receipt.js new file mode 100644 index 0000000..6c9a336 --- /dev/null +++ b/receipt.js @@ -0,0 +1,28 @@ +const monthlyField = document.getElementById("monthly"); +const totalField = document.getElementById("total"); + +const start_num = document.getElementById("start_num"); +const final_num = document.getElementById("final_num"); +const rate = document.getElementById("rate"); + +getMonthly(); +getTotal(); + +start_num.addEventListener("click", getMonthly); +final_num.addEventListener("input", getMonthly); +start_num.addEventListener("click", getTotal); +final_num.addEventListener("input", getTotal); +rate.addEventListener("input", getTotal); + +var monthly; +var total; + +function getMonthly() { + monthly = final_num.value - start_num.value; + monthlyField.value = monthly; +} + +function getTotal() { + total = monthly * rate.value; + totalField.value = Number((total).toFixed(2)); +} \ No newline at end of file diff --git a/receipt.php b/receipt.php new file mode 100644 index 0000000..a6b1865 --- /dev/null +++ b/receipt.php @@ -0,0 +1,156 @@ + 0) { + + while($row = mysqli_fetch_array($result)) { + $start_date = $row['start_date']; + $final_date = $row['final_date']; + $start_num = $row['start_num']; + $final_num = $row['final_num']; + $rate = $row['rate']; + $comment = $row['comment']; + } + } + + #Validate ownership + $link_user_id = $_GET['user_id']; + $session_user_id = $_SESSION['user_id']; + + if ($link_user_id != $session_user_id) { + header("Location: index.php"); + } + + #Post method + if ($_SERVER["REQUEST_METHOD"] == "POST") { + + #Collect data from html form via POST request method + $start_date = $_POST['start_date']; + $final_date = $_POST['final_date']; + $start_num = $_POST['start_num']; + $final_num = $_POST['final_num']; + $rate = $_POST['rate']; + $comment = $_POST['comment']; + + #Define error variables and set to empty valuse + $dateErr = $numErr = $rateErr = $commentErr = NULL; + + #Validate form and catch errors + + #Date confirmation + if(empty($start_date) || empty($final_date)) { + $dateErr = "Вы не ввели дату"; + } + + #Num confirmation + if ($start_num < 0 || empty($final_num)) { + $numErr = "Вы не ввели показания счётчика"; + } + + #Rate confirmation + if (empty($rate)) { + $rateErr = "Вы не ввели тариф"; + } + + #Comment validation + if (strlen($comment) > 255) { + $commentErr = "Коммнтарий не можеть быть длиннее 255 символов"; + } + + #Post data to the database is there are no errors + if ($dateErr == NULL && $numErr == NULL && $rateErr == NULL && $commentErr == NULL) { + + if ($receipt_id == NULL) { + + $query = "INSERT INTO Receipts (book_id, start_date, final_date, start_num, final_num, rate, comment) VALUES ('$book_id', '$start_date', '$final_date', '$start_num', '$final_num', '$rate', '$comment')"; + + if (mysqli_query($conn, $query)) { + echo "New record has been created successfully"; + header('Location: book.php?user_id='.$session_user_id.'&book_id='.$book_id.''); + } else { + echo mysqli_errno($conn) . " : " . mysqli_error($conn); + } + } else { + + $query = "UPDATE Receipts SET start_date = '$start_date', final_date = '$final_date', start_num = '$start_num', final_num = '$final_num', rate = '$rate', comment = '$comment' WHERE (receipt_id = '$receipt_id')"; + + if (mysqli_query($conn, $query)) { + echo "Receipts has been updated"; + header('Location: book.php?user_id='.$session_user_id.'&book_id='.$book_id.''); + } else { + echo mysqli_errno($conn) . " : " . mysqli_error($conn); + } + } + } + + mysqli_close($conn); + } + +?> + + + + + + +
+ + Назад + +
+ +

: Запись №

+ +
+ +

Дата*:

+ > - > +
+
+ +

Показания счётчика*:     За месяц:

+ > - > : +
+
+ +

Тариф*:        Сумма:

+ > : +
+
+ +

Комментарий к записи:

+ +
+
+ + +

+ + Удалить +
+ + +
+ +
+ + + + + + \ No newline at end of file diff --git a/remove_book.php b/remove_book.php new file mode 100644 index 0000000..6a2477f --- /dev/null +++ b/remove_book.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/remove_receipt.php b/remove_receipt.php new file mode 100644 index 0000000..b76d05a --- /dev/null +++ b/remove_receipt.php @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/remove_user.php b/remove_user.php new file mode 100644 index 0000000..d34018b --- /dev/null +++ b/remove_user.php @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/sign_up.php b/sign_up.php new file mode 100644 index 0000000..9ce40b1 --- /dev/null +++ b/sign_up.php @@ -0,0 +1,106 @@ + + + + + +
+ +

Создать аккаунт

+ +
* обязательное поле
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +

У вас уже есть аккаунт? Войти

+
+ + \ No newline at end of file