From 5a896ae00afc8f381977bf274f6e2fca4d9c3e89 Mon Sep 17 00:00:00 2001
From: Egor Deev <67710823+IGlek@users.noreply.github.com>
Date: Tue, 30 Nov 2021 16:04:34 +0700
Subject: [PATCH] v. 2

---
 main.py  |  216 +++++++--
 rasp.ui  | 1310 ++++++++++++++++++++++++++++++------------------------
 table.db |  Bin 24576 -> 24576 bytes
 3 files changed, 911 insertions(+), 615 deletions(-)

diff --git a/main.py b/main.py
index 5828935..6453fc6 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,10 @@
+import datetime as dt
 import sqlite3
 import sys
 
-from PyQt5.QtWidgets import QApplication, QMessageBox, QWidget
-from PyQt5.QtWidgets import QMainWindow, QTableWidgetItem, QTableWidget
 from PyQt5 import QtCore, QtWidgets, QtGui, uic
+from PyQt5.QtWidgets import QApplication, QMessageBox, QMainWindow, QTableWidgetItem
+from PyQt5.QtWidgets import QWidget, QTableView, QTableWidget, QComboBox
 
 if hasattr(QtCore.Qt, 'AA_EnableHighDpiScaling'):
     QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True)
@@ -18,59 +19,192 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
         uic.loadUi('rasp.ui', self)  # self.setupUi(self)
         self.connection = sqlite3.connect("table.db")
         self.cursor = self.connection.cursor()
-        # По умолчанию будем выводить все данные из таблицы
+
+        # РАСПИСАНИЕ
+        self.add_but.clicked.connect(self.add)  # ДОБАВЛЕНИЕ ПРЕДМЕТОВ
+        self.upd_but.clicked.connect(self.upd)  # ИЗМЕНЕНИЕ ПРЕДМЕТОВ
+        self.clear_but.clicked.connect(self.clear)  # УБИРАНИЕ ПРЕДМЕТОВ
+        self.del_but.clicked.connect(self.delete)  # УДАЛЕНИЕ ПРЕДМЕТОВ
+
+        # ДАННЫЕ ТАБЛИЦЫ
         self.table()
 
     def table(self):
         try:
             # РАСПИСАНИЕ
-            print(1)
             with self.connection:
                 all_day = self.cursor.execute("SELECT * FROM timetable").fetchall()
-            # Заполним размеры таблицы
             tables = [self.Mon_school, self.Tue_school, self.Wed_school,
                       self.Thu_school, self.Fri_school, self.Sat_school]
-            print(2)
-            for day in tables:
-                day = day.QTableWidget.QTableView
-                day.setSpan(8, 1)
-                print(3)
-                # Заполняем таблицу элементами
-                i, row = enumerate(all_day[tables.index(day)])
-                print(i, row)
-                for j, elem in enumerate(row):
-                    self.tableWidget_2.setItem(
-                        i, j, QTableWidgetItem(str(elem)))
 
-            """
-            # ВСЕ ФИЛЬМЫ
-            with self.connection:
-                res = self.cursor.execute("SELECT * FROM films").fetchall()
-            # Заполним размеры таблицы
-            self.tableWidget.setColumnCount(5)
-            self.tableWidget.setRowCount(0)
-            # Заполняем таблицу элементами
-            self.tableWidget.setHorizontalHeaderLabels(["ИД", "Название фильм", "Год выпуска",
-                                                        "Жанр", "Продолжительность"])
-            for i, row in enumerate(res):
-                self.tableWidget.setRowCount(
-                    self.tableWidget.rowCount() + 1)
-                for j, elem in enumerate(row):
-                    if j == 3:
-                        for n, name in gnr:
-                            if n == elem:
-                                self.tableWidget.setItem(
-                                    i, j, QTableWidgetItem(str(name)))
-                                break
+            for day in tables:
+                weekday, subjects = all_day[tables.index(day)], []
+                for i in range(10):
+                    if i > 1:
+                        if weekday[i]:
+                            obj = self.cursor.execute(f"SELECT name FROM "
+                                                      f"lessons WHERE `id` = {weekday[i]}").fetchone()[0]
+                        else:
+                            obj = ""
+                        subjects.append((obj, ))
+                day.setColumnCount(1)
+                day.setHorizontalHeaderLabels(["Предмет"])
+                day.setRowCount(0)
+
+                for i, row in enumerate(subjects):
+                    day.setRowCount(day.rowCount() + 1)
+                    for j, elem in enumerate(row):
+                        day.setItem(i, j, QTableWidgetItem(str(elem)))
+                day.horizontalHeader().setStretchLastSection(True)
+
+            # ЗАПОЛНЕНИЕ ВЫПАДАЮЩИХ СПИСКОВ ADD / UPD / DEL
+            try:
+                with self.connection:
+                    lessons = self.cursor.execute('SELECT `name` FROM `lessons`').fetchall()
+                lessons = [i[0] for i in lessons]
+                for choose_obj in [self.choose_obj1, self.choose_obj2, self.choose_obj3]:
+                    choose_obj.clear()
+                    if choose_obj == self.choose_obj1:
+                        choose_obj.insertItem(0, "Новый предмет")
+                        choose_obj.insertItems(1, lessons)
                     else:
-                        self.tableWidget.setItem(
-                            i, j, QTableWidgetItem(str(elem)))
-            """
+                        choose_obj.insertItems(0, lessons)
+            except Exception:
+                pass
+
+            # ВСЕ ЗАМЕТКИ
+            with self.connection:
+                note = self.cursor.execute("SELECT `date`, `note` FROM notes").fetchall()
+            maintable = self.maintable
+            maintable.setColumnCount(2)
+            maintable.setRowCount(0)
+            maintable.setHorizontalHeaderLabels(["Дата", "Заметка"])
+
+            for i, row in enumerate(note):
+                maintable.setRowCount(maintable.rowCount() + 1)
+                for j, elem in enumerate(row):
+                    maintable.setItem(i, j, QTableWidgetItem(str(elem)))
+            maintable.horizontalHeader().setStretchLastSection(True)
+
+            # ЗАМЕТКИ ПОД РАСПИСАНИЕМ
+            with self.connection:
+                note = self.cursor.execute("SELECT `date`, `note` FROM notes").fetchall()
+            notes = [self.Mon_note, self.Tue_note, self.Wed_note, self.Thu_note, self.Fri_note, self.Sat_note]
+
+            week = {0: [], 1: [], 2: [], 3: [], 4: [], 5: []}
+            for i in note:
+                weekday = dt.datetime.weekday(i[0])
+                if weekday != 6:
+                    week[weekday].append(i)
+
+            for write in notes:
+                write.setColumnCount(2)
+                write.setRowCount(0)
+                write.setHorizontalHeaderLabels(["Дата", "Заметка"])
+
+                for i, row in enumerate(week[notes.index(write)]):
+                    write.setRowCount(write.rowCount() + 1)
+                    for j, elem in enumerate(row):
+                        write.setItem(i, j, QTableWidgetItem(str(elem)))
+                write.horizontalHeader().setStretchLastSection(True)
+
         except Exception:
             QMessageBox.about(self, 'Ошибка!', "Таблица данных не найдена!")
 
+    def add(self):
+        day = self.weekday1.currentIndex()
+        obj = self.object1.currentIndex()
+        txt1 = self.add_line.text()
+        txt2 = self.choose_obj1.currentText()
+        if txt1 or txt2 != "Новый предмет":
+            with self.connection:
+                lessons = self.cursor.execute('SELECT `name` FROM `lessons`').fetchall()
+            lessons = [i[0] for i in lessons]
+            if txt1:
+                if txt1 not in lessons:
+                    with self.connection:
+                        self.cursor.execute(f"INSERT INTO `lessons` (`name`) VALUES(?)", (txt1,))
+                        lessons = self.cursor.execute('SELECT `name` FROM `lessons`').fetchall()
+                    lessons = [i[0] for i in lessons]
+                with self.connection:
+                    index = self.cursor.execute("SELECT `id` FROM `lessons` WHERE `name` = ?", (txt1,)).fetchone()[0]
+            else:
+                with self.connection:
+                    index = self.cursor.execute("SELECT `id` FROM `lessons` WHERE `name` = ?", (txt2,)).fetchone()[0]
+            with self.connection:
+                less = self.cursor.execute("SELECT * FROM `timetable` WHERE `id` = ?", (day + 1,)).fetchone()
+            less = list(less)[2:]
+            if None in less:
+                if obj == 0:
+                    k = 0
+                    for les in reversed(less):
+                        if les is not None:
+                            obj = len(less) - k + 1
+                            break
+                        else:
+                            k += 1
+                    if k == len(less):
+                        obj = 1
+                with self.connection:
+                    self.cursor.execute(f"UPDATE `timetable` SET `less_{obj}` = ? WHERE `id` = ?", (index, day + 1))
+                for choose_obj in [self.choose_obj1, self.choose_obj2]:
+                    choose_obj.clear()
+                    choose_obj.insertItem(0, "Новый предмет")
+                self.add_line.clear()
+                self.table()
+            else:
+                for choose_obj in [self.choose_obj1, self.choose_obj2]:
+                    choose_obj.clear()
+                    choose_obj.insertItem(0, "Новый предмет")
+                    choose_obj.insertItems(1, lessons)
+                QMessageBox.about(self, 'Ошибка!', "В этом дне уже расписание всё занято!")
+        else:
+            QMessageBox.about(self, 'Ошибка!', "Введите предмет, который желаете добавить!")
+
+    def upd(self):
+        obj = self.choose_obj2.currentText()
+        txt = self.upd_line.text()
+        if txt != "":
+            with self.connection:
+                self.cursor.execute(f"UPDATE `lessons` SET `name` = ? WHERE `name` = ?", (txt, obj))
+            self.upd_line.clear()
+            self.table()
+        else:
+            QMessageBox.about(self, 'Ошибка!', "Вы не ввели новое название!")
+
+    def clear(self):
+        day = self.weekday3.currentIndex()
+        obj = self.object3.currentIndex()
+
+        for wkd in range(1, 7):
+            if day == 0 or day == wkd:
+                for less in range(1, 9):
+                    if obj == 0 or obj == less:
+                        with self.connection:
+                            self.cursor.execute(f"UPDATE `timetable` SET `less_{less}` = ? WHERE `id` = ?", (None, wkd))
+        self.table()
+
+    def delete(self):
+        index = self.choose_obj3.currentText()
+        with self.connection:
+            ids = self.cursor.execute("SELECT `id` FROM `lessons` WHERE `name` = ?", (index, )).fetchone()[0]
+            self.cursor.execute("DELETE FROM `lessons` WHERE `id` = ?", (ids, ))
+
+        for day in range(1, 7):
+            with self.connection:
+                lessons = self.cursor.execute("SELECT * FROM `timetable` WHERE `id` = ?", (day,)).fetchone()
+            lessons = list(lessons)[2:]
+            if ids in lessons:
+                for less in range(1, 9):
+                    if ids == lessons[less - 1]:
+                        with self.connection:
+                            self.cursor.execute(f"UPDATE `timetable` SET `less_{less}` = ? WHERE `id` = ?", (None, day))
+        self.table()
+
+    def notes(self):
+        pass
+
     def closeEvent(self, event):
-        # При закрытии формы закроем и наше соединение с базой данных
         self.connection.close()
 
 
@@ -78,4 +212,4 @@ if __name__ == '__main__':
     app = QApplication(sys.argv)
     ex = MyWidget()
     ex.show()
-    sys.exit(app.exec_())
\ No newline at end of file
+    sys.exit(app.exec_())
diff --git a/rasp.ui b/rasp.ui
index 1145929..80d6fa3 100644
--- a/rasp.ui
+++ b/rasp.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1042</width>
-    <height>754</height>
+    <width>1002</width>
+    <height>817</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -28,48 +28,14 @@
         <string>Расписание</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QWidget" name="Monday" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout_7">
-           <item>
-            <widget class="QLabel" name="Mon">
-             <property name="font">
-              <font>
-               <pointsize>14</pointsize>
-              </font>
-             </property>
-             <property name="styleSheet">
-              <string notr="true">QLable { font-size: 14px; }</string>
-             </property>
-             <property name="text">
-              <string>Понедельник</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QTableView" name="Mon_school"/>
-           </item>
-           <item>
-            <widget class="QTableWidget" name="Mon_note">
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>80</height>
-              </size>
-             </property>
-             <property name="baseSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
         <item row="0" column="1">
          <widget class="QWidget" name="Tuesday" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>370</height>
+           </size>
+          </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">
            <item>
             <widget class="QLabel" name="Tue">
@@ -102,8 +68,60 @@
           </layout>
          </widget>
         </item>
+        <item row="0" column="0">
+         <widget class="QWidget" name="Monday" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>370</height>
+           </size>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_7">
+           <item>
+            <widget class="QLabel" name="Mon">
+             <property name="font">
+              <font>
+               <pointsize>14</pointsize>
+              </font>
+             </property>
+             <property name="styleSheet">
+              <string notr="true">QLable { font-size: 14px; }</string>
+             </property>
+             <property name="text">
+              <string>Понедельник</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QTableWidget" name="Mon_school"/>
+           </item>
+           <item>
+            <widget class="QTableWidget" name="Mon_note">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>80</height>
+              </size>
+             </property>
+             <property name="baseSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
         <item row="0" column="2">
          <widget class="QWidget" name="Wednesday" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>370</height>
+           </size>
+          </property>
           <layout class="QVBoxLayout" name="verticalLayout_9">
            <item>
             <widget class="QLabel" name="Wed">
@@ -136,11 +154,112 @@
           </layout>
          </widget>
         </item>
+        <item row="2" column="0">
+         <widget class="QWidget" name="Thursday" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>370</height>
+           </size>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_10">
+           <item>
+            <widget class="QLabel" name="Thu">
+             <property name="font">
+              <font>
+               <pointsize>14</pointsize>
+              </font>
+             </property>
+             <property name="styleSheet">
+              <string notr="true">QLable { font-size: 14px; }</string>
+             </property>
+             <property name="text">
+              <string>Четверг</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QTableWidget" name="Thu_school"/>
+           </item>
+           <item>
+            <widget class="QTableWidget" name="Thu_note">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>80</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="QWidget" name="Saturday" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>370</height>
+           </size>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_12">
+           <item>
+            <widget class="QLabel" name="Sat">
+             <property name="font">
+              <font>
+               <pointsize>14</pointsize>
+              </font>
+             </property>
+             <property name="styleSheet">
+              <string notr="true">QLable { font-size: 14px; }</string>
+             </property>
+             <property name="text">
+              <string>Суббота</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QTableWidget" name="Sat_school"/>
+           </item>
+           <item>
+            <widget class="QTableWidget" name="Sat_note">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>80</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
         <item row="0" column="3">
          <widget class="QWidget" name="Add_Upd" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>190</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>190</width>
+            <height>16777215</height>
+           </size>
+          </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
+           <item>
+            <widget class="QWidget" name="fake4" native="true"/>
+           </item>
            <item>
             <widget class="QGroupBox" name="Add">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>170</height>
+              </size>
+             </property>
              <property name="font">
               <font>
                <pointsize>10</pointsize>
@@ -159,7 +278,7 @@
                <widget class="QWidget" name="combo1" native="true">
                 <property name="minimumSize">
                  <size>
-                  <width>0</width>
+                  <width>152</width>
                   <height>30</height>
                  </size>
                 </property>
@@ -186,8 +305,8 @@
                   <widget class="QComboBox" name="weekday1">
                    <property name="minimumSize">
                     <size>
-                     <width>0</width>
-                     <height>30</height>
+                     <width>72</width>
+                     <height>25</height>
                     </size>
                    </property>
                    <item>
@@ -220,19 +339,14 @@
                      <string>Сб</string>
                     </property>
                    </item>
-                   <item>
-                    <property name="text">
-                     <string>Вс</string>
-                    </property>
-                   </item>
                   </widget>
                  </item>
                  <item>
                   <widget class="QComboBox" name="object1">
                    <property name="minimumSize">
                     <size>
-                     <width>0</width>
-                     <height>30</height>
+                     <width>71</width>
+                     <height>25</height>
                     </size>
                    </property>
                    <item>
@@ -290,7 +404,17 @@
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
-                  <height>30</height>
+                  <height>25</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="choose_obj1">
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>25</height>
                  </size>
                 </property>
                </widget>
@@ -300,14 +424,12 @@
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
-                  <height>30</height>
+                  <height>37</height>
                  </size>
                 </property>
                 <property name="font">
                  <font>
                   <pointsize>-1</pointsize>
-                  <weight>50</weight>
-                  <bold>false</bold>
                  </font>
                 </property>
                 <property name="styleSheet">
@@ -317,21 +439,39 @@
     font-size: 18px;
     border-radius: 10px;
     border: 1px solid #3873d9;
-    background-color: white; }</string>
+    background-color: white;
+	box-shadow: 0 0 10px rgb(0, 0, 0);\n
+	transition: all 1s;
+}
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
                 </property>
                 <property name="text">
-                 <string>Добавить</string>
+                 <string>Обновить</string>
                 </property>
                </widget>
               </item>
              </layout>
-             <zorder>combo1</zorder>
-             <zorder>add_line</zorder>
-             <zorder>add_but</zorder>
             </widget>
            </item>
+           <item>
+            <widget class="QWidget" name="fake1" native="true"/>
+           </item>
            <item>
             <widget class="QGroupBox" name="Upd">
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>170</height>
+              </size>
+             </property>
              <property name="font">
               <font>
                <pointsize>10</pointsize>
@@ -347,128 +487,13 @@
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_16">
               <item>
-               <widget class="QWidget" name="combo2" native="true">
+               <widget class="QComboBox" name="choose_obj2">
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
-                  <height>30</height>
+                  <height>25</height>
                  </size>
                 </property>
-                <layout class="QHBoxLayout" name="horizontalLayout_2">
-                 <property name="spacing">
-                  <number>9</number>
-                 </property>
-                 <property name="sizeConstraint">
-                  <enum>QLayout::SetFixedSize</enum>
-                 </property>
-                 <property name="leftMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="topMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="rightMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="bottomMargin">
-                  <number>0</number>
-                 </property>
-                 <item>
-                  <widget class="QComboBox" name="weekday2">
-                   <property name="minimumSize">
-                    <size>
-                     <width>0</width>
-                     <height>30</height>
-                    </size>
-                   </property>
-                   <item>
-                    <property name="text">
-                     <string>Пн</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>Вт</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>Ср</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>Чт</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>Пт</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>Сб</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>Вс</string>
-                    </property>
-                   </item>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QComboBox" name="object2">
-                   <property name="minimumSize">
-                    <size>
-                     <width>0</width>
-                     <height>30</height>
-                    </size>
-                   </property>
-                   <item>
-                    <property name="text">
-                     <string>1</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>2</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>3</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>4</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>5</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>6</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>7</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>8</string>
-                    </property>
-                   </item>
-                  </widget>
-                 </item>
-                </layout>
                </widget>
               </item>
               <item>
@@ -476,7 +501,7 @@
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
-                  <height>30</height>
+                  <height>25</height>
                  </size>
                 </property>
                </widget>
@@ -486,7 +511,13 @@
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
-                  <height>30</height>
+                  <height>35</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>16777215</width>
+                  <height>37</height>
                  </size>
                 </property>
                 <property name="font">
@@ -501,10 +532,19 @@
     font-size: 18px;
     border-radius: 10px;
     border: 1px solid #3873d9;
-    background-color: white; }</string>
+    background-color: white; }
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
                 </property>
                 <property name="text">
-                 <string>Обновить</string>
+                 <string>Изменить</string>
                 </property>
                </widget>
               </item>
@@ -514,42 +554,14 @@
           </layout>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="QWidget" name="Thursday" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout_10">
-           <item>
-            <widget class="QLabel" name="Thu">
-             <property name="font">
-              <font>
-               <pointsize>14</pointsize>
-              </font>
-             </property>
-             <property name="styleSheet">
-              <string notr="true">QLable { font-size: 14px; }</string>
-             </property>
-             <property name="text">
-              <string>Четверг</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QTableWidget" name="Thu_school"/>
-           </item>
-           <item>
-            <widget class="QTableWidget" name="Thu_note">
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>80</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="1" column="1">
+        <item row="2" column="1">
          <widget class="QWidget" name="Friday" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>240</width>
+            <height>370</height>
+           </size>
+          </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
            <item>
             <widget class="QLabel" name="Fri">
@@ -582,45 +594,32 @@
           </layout>
          </widget>
         </item>
-        <item row="1" column="2">
-         <widget class="QWidget" name="Saturday" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout_12">
+        <item row="2" column="3">
+         <widget class="QWidget" name="Clear_Del" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>190</width>
+            <height>0</height>
+           </size>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout">
            <item>
-            <widget class="QLabel" name="Sat">
-             <property name="font">
-              <font>
-               <pointsize>14</pointsize>
-              </font>
-             </property>
-             <property name="styleSheet">
-              <string notr="true">QLable { font-size: 14px; }</string>
-             </property>
-             <property name="text">
-              <string>Суббота</string>
-             </property>
-            </widget>
+            <widget class="QWidget" name="fake3" native="true"/>
            </item>
            <item>
-            <widget class="QTableWidget" name="Sat_school"/>
-           </item>
-           <item>
-            <widget class="QTableWidget" name="Sat_note">
+            <widget class="QGroupBox" name="Clear">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="maximumSize">
               <size>
                <width>16777215</width>
-               <height>80</height>
+               <height>170</height>
               </size>
              </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="QWidget" name="Del_Space" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout_14">
-           <item>
-            <widget class="QGroupBox" name="Del">
              <property name="font">
               <font>
                <pointsize>10</pointsize>
@@ -629,7 +628,7 @@
               </font>
              </property>
              <property name="title">
-              <string>Удалить предмет</string>
+              <string>Убрать предмет</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignCenter</set>
@@ -693,11 +692,6 @@
                   <string>Сб</string>
                  </property>
                 </item>
-                <item>
-                 <property name="text">
-                  <string>Вс</string>
-                 </property>
-                </item>
                </widget>
               </item>
               <item>
@@ -710,7 +704,7 @@
                 </property>
                 <item>
                  <property name="text">
-                  <string>Любой</string>
+                  <string>Все</string>
                  </property>
                 </item>
                 <item>
@@ -756,7 +750,92 @@
                </widget>
               </item>
               <item>
-               <widget class="QComboBox" name="subjects">
+               <widget class="QPushButton" name="clear_but">
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>40</height>
+                 </size>
+                </property>
+                <property name="font">
+                 <font>
+                  <pointsize>-1</pointsize>
+                 </font>
+                </property>
+                <property name="styleSheet">
+                 <string notr="true">QPushButton {
+    padding:10px;
+    color: #fffff;
+    font-size: 18px;
+    border-radius: 10px;
+    border: 1px solid #3873d9;
+    background-color: white; }
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
+                </property>
+                <property name="text">
+                 <string>Убрать</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QWidget" name="fake2" native="true"/>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="Del">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>170</height>
+              </size>
+             </property>
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="title">
+              <string>Удалить предмет</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_18">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="leftMargin">
+               <number>9</number>
+              </property>
+              <property name="topMargin">
+               <number>9</number>
+              </property>
+              <property name="rightMargin">
+               <number>9</number>
+              </property>
+              <property name="bottomMargin">
+               <number>9</number>
+              </property>
+              <item>
+               <widget class="QComboBox" name="choose_obj3">
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
@@ -770,14 +849,12 @@
                 <property name="minimumSize">
                  <size>
                   <width>0</width>
-                  <height>30</height>
+                  <height>40</height>
                  </size>
                 </property>
                 <property name="font">
                  <font>
                   <pointsize>-1</pointsize>
-                  <weight>50</weight>
-                  <bold>false</bold>
                  </font>
                 </property>
                 <property name="styleSheet">
@@ -787,7 +864,16 @@
     font-size: 18px;
     border-radius: 10px;
     border: 1px solid #3873d9;
-    background-color: white; }</string>
+    background-color: white; }
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
                 </property>
                 <property name="text">
                  <string>Удалить</string>
@@ -797,27 +883,10 @@
              </layout>
             </widget>
            </item>
-           <item>
-            <widget class="QPushButton" name="Space">
-             <property name="styleSheet">
-              <string notr="true">QPushButton {
-    padding:10px;
-    color: #fffff;
-    font-size: 18px;
-    border-radius: 10px;
-    border: 1px solid #3873d9;
-    background-color: white; }</string>
-             </property>
-             <property name="text">
-              <string>Обнуление</string>
-             </property>
-            </widget>
-           </item>
           </layout>
          </widget>
         </item>
        </layout>
-       <zorder>Del_Space</zorder>
        <zorder>Add_Upd</zorder>
        <zorder>Saturday</zorder>
        <zorder>Friday</zorder>
@@ -825,321 +894,414 @@
        <zorder>Wednesday</zorder>
        <zorder>Tuesday</zorder>
        <zorder>Monday</zorder>
+       <zorder>Clear_Del</zorder>
       </widget>
-      <widget class="QWidget" name="tab_2">
+      <widget class="QWidget" name="note">
        <attribute name="title">
         <string>Заметки</string>
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_6">
         <item>
-         <widget class="QWidget" name="widget_14" native="true">
-          <widget class="QTabWidget" name="tabWidget_2">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>430</y>
-             <width>681</width>
-             <height>251</height>
-            </rect>
-           </property>
-           <property name="font">
-            <font>
-             <pointsize>10</pointsize>
-            </font>
-           </property>
-           <property name="currentIndex">
-            <number>2</number>
-           </property>
-           <widget class="QWidget" name="tab_3">
-            <attribute name="title">
-             <string>Сделать</string>
-            </attribute>
-            <layout class="QVBoxLayout" name="verticalLayout_3">
-             <item>
-              <widget class="QWidget" name="widget_12" native="true">
-               <widget class="QPushButton" name="pushButton_5">
-                <property name="geometry">
-                 <rect>
-                  <x>10</x>
-                  <y>10</y>
-                  <width>211</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true">QPushButton {
-    padding:10px;
-    color: #fffff;
-    font-size: 18px;
-    border-radius: 10px;
-    border: 1px solid #3873d9;
-    background-color: white; }</string>
-                </property>
-                <property name="text">
-                 <string>Выполнено</string>
-                </property>
-               </widget>
-               <widget class="QDateTimeEdit" name="dateTimeEdit_4">
-                <property name="geometry">
-                 <rect>
-                  <x>10</x>
-                  <y>70</y>
-                  <width>211</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-                <property name="font">
-                 <font>
-                  <pointsize>12</pointsize>
-                 </font>
-                </property>
-               </widget>
-               <widget class="QComboBox" name="comboBox">
-                <property name="geometry">
-                 <rect>
-                  <x>240</x>
-                  <y>10</y>
-                  <width>411</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-               </widget>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="tab_4">
-            <attribute name="title">
-             <string>Добавить</string>
-            </attribute>
-            <layout class="QVBoxLayout" name="verticalLayout_4">
-             <item>
-              <widget class="QWidget" name="widget_10" native="true">
-               <widget class="QPlainTextEdit" name="plainTextEdit">
-                <property name="geometry">
-                 <rect>
-                  <x>230</x>
-                  <y>10</y>
-                  <width>411</width>
-                  <height>111</height>
-                 </rect>
-                </property>
-               </widget>
-               <widget class="QPushButton" name="pushButton_6">
-                <property name="geometry">
-                 <rect>
-                  <x>10</x>
-                  <y>10</y>
-                  <width>211</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true">QPushButton {
-    padding:10px;
-    color: #fffff;
-    font-size: 18px;
-    border-radius: 10px;
-    border: 1px solid #3873d9;
-    background-color: white; }</string>
-                </property>
-                <property name="text">
-                 <string>Добавить</string>
-                </property>
-               </widget>
-               <widget class="QDateTimeEdit" name="dateTimeEdit_3">
-                <property name="geometry">
-                 <rect>
-                  <x>10</x>
-                  <y>70</y>
-                  <width>211</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-                <property name="font">
-                 <font>
-                  <pointsize>12</pointsize>
-                 </font>
-                </property>
-               </widget>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="tab_7">
-            <attribute name="title">
-             <string>Редактрировать</string>
-            </attribute>
-            <layout class="QVBoxLayout" name="verticalLayout_5">
-             <item>
-              <widget class="QWidget" name="widget_11" native="true">
-               <widget class="QPushButton" name="pushButton_9">
-                <property name="geometry">
-                 <rect>
-                  <x>10</x>
-                  <y>10</y>
-                  <width>211</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true">QPushButton {
-    padding:10px;
-    color: #fffff;
-    font-size: 18px;
-    border-radius: 10px;
-    border: 1px solid #3873d9;
-    background-color: white; }</string>
-                </property>
-                <property name="text">
-                 <string>Обновить</string>
-                </property>
-               </widget>
-               <widget class="QDateTimeEdit" name="dateTimeEdit_5">
-                <property name="geometry">
-                 <rect>
-                  <x>10</x>
-                  <y>70</y>
-                  <width>211</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-                <property name="font">
-                 <font>
-                  <pointsize>12</pointsize>
-                 </font>
-                </property>
-               </widget>
-               <widget class="QComboBox" name="comboBox_9">
-                <property name="geometry">
-                 <rect>
-                  <x>10</x>
-                  <y>130</y>
-                  <width>211</width>
-                  <height>51</height>
-                 </rect>
-                </property>
-               </widget>
-               <widget class="QPlainTextEdit" name="plainTextEdit_3">
-                <property name="geometry">
-                 <rect>
-                  <x>240</x>
-                  <y>10</y>
-                  <width>411</width>
-                  <height>171</height>
-                 </rect>
-                </property>
-               </widget>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-          <widget class="QGroupBox" name="groupBox_4">
-           <property name="geometry">
-            <rect>
-             <x>710</x>
-             <y>430</y>
-             <width>261</width>
-             <height>251</height>
-            </rect>
-           </property>
-           <property name="font">
-            <font>
-             <pointsize>10</pointsize>
-             <weight>75</weight>
-             <bold>true</bold>
-            </font>
-           </property>
-           <property name="title">
-            <string> Просмотр заметки</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-           </property>
-           <widget class="QWidget" name="widget_13" native="true">
-            <property name="geometry">
-             <rect>
-              <x>10</x>
-              <y>20</y>
-              <width>241</width>
-              <height>221</height>
-             </rect>
-            </property>
-            <widget class="QComboBox" name="comboBox_5">
-             <property name="geometry">
-              <rect>
-               <x>10</x>
-               <y>10</y>
-               <width>221</width>
-               <height>31</height>
-              </rect>
+         <widget class="QTableWidget" name="maintable">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>16777215</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QWidget" name="widget" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>960</width>
+            <height>260</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>280</height>
+           </size>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <item>
+            <widget class="QTabWidget" name="tabWidget_2">
+             <property name="minimumSize">
+              <size>
+               <width>675</width>
+               <height>0</height>
+              </size>
              </property>
-             <item>
-              <property name="text">
-               <string>За всё время</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>За месяц</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>За неделю</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>На опред. дату</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>На опред. время</string>
-              </property>
-             </item>
-            </widget>
-            <widget class="QPushButton" name="pushButton_2">
-             <property name="geometry">
-              <rect>
-               <x>10</x>
-               <y>170</y>
-               <width>221</width>
-               <height>41</height>
-              </rect>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>250</height>
+              </size>
              </property>
              <property name="font">
               <font>
-               <pointsize>-1</pointsize>
+               <pointsize>10</pointsize>
               </font>
              </property>
-             <property name="styleSheet">
-              <string notr="true">QPushButton {
+             <property name="currentIndex">
+              <number>2</number>
+             </property>
+             <widget class="QWidget" name="Doing">
+              <attribute name="title">
+               <string>Сделать</string>
+              </attribute>
+              <layout class="QVBoxLayout" name="verticalLayout_3">
+               <item>
+                <widget class="QWidget" name="default1" native="true">
+                 <widget class="QPushButton" name="complete">
+                  <property name="geometry">
+                   <rect>
+                    <x>10</x>
+                    <y>10</y>
+                    <width>211</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                  <property name="styleSheet">
+                   <string notr="true">QPushButton {
     padding:10px;
     color: #fffff;
     font-size: 18px;
     border-radius: 10px;
     border: 1px solid #3873d9;
-    background-color: white; }</string>
-             </property>
-             <property name="text">
-              <string>Показать</string>
-             </property>
+    background-color: white; }
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
+                  </property>
+                  <property name="text">
+                   <string>Выполнено</string>
+                  </property>
+                 </widget>
+                 <widget class="QDateTimeEdit" name="date_1">
+                  <property name="geometry">
+                   <rect>
+                    <x>10</x>
+                    <y>70</y>
+                    <width>211</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                  <property name="font">
+                   <font>
+                    <pointsize>12</pointsize>
+                   </font>
+                  </property>
+                 </widget>
+                 <widget class="QComboBox" name="choose">
+                  <property name="geometry">
+                   <rect>
+                    <x>240</x>
+                    <y>10</y>
+                    <width>411</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                 </widget>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+             <widget class="QWidget" name="Adding">
+              <attribute name="title">
+               <string>Добавить</string>
+              </attribute>
+              <layout class="QHBoxLayout" name="horizontalLayout_5">
+               <item>
+                <widget class="QWidget" name="default2" native="true">
+                 <property name="minimumSize">
+                  <size>
+                   <width>233</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <widget class="QPushButton" name="added">
+                  <property name="geometry">
+                   <rect>
+                    <x>10</x>
+                    <y>10</y>
+                    <width>211</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                  <property name="styleSheet">
+                   <string notr="true">QPushButton {
+    padding:10px;
+    color: #fffff;
+    font-size: 18px;
+    border-radius: 10px;
+    border: 1px solid #3873d9;
+    background-color: white; }
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
+                  </property>
+                  <property name="text">
+                   <string>Добавить</string>
+                  </property>
+                 </widget>
+                 <widget class="QDateTimeEdit" name="date_2">
+                  <property name="geometry">
+                   <rect>
+                    <x>10</x>
+                    <y>70</y>
+                    <width>211</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                  <property name="font">
+                   <font>
+                    <pointsize>12</pointsize>
+                   </font>
+                  </property>
+                 </widget>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPlainTextEdit" name="write"/>
+               </item>
+              </layout>
+             </widget>
+             <widget class="QWidget" name="Upating">
+              <attribute name="title">
+               <string>Редактрировать</string>
+              </attribute>
+              <layout class="QHBoxLayout" name="horizontalLayout_4">
+               <item>
+                <widget class="QWidget" name="default3" native="true">
+                 <property name="minimumSize">
+                  <size>
+                   <width>233</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <widget class="QPushButton" name="update">
+                  <property name="geometry">
+                   <rect>
+                    <x>10</x>
+                    <y>10</y>
+                    <width>211</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                  <property name="styleSheet">
+                   <string notr="true">QPushButton {
+    padding:10px;
+    color: #fffff;
+    font-size: 18px;
+    border-radius: 10px;
+    border: 1px solid #3873d9;
+    background-color: white; }
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
+                  </property>
+                  <property name="text">
+                   <string>Обновить</string>
+                  </property>
+                 </widget>
+                 <widget class="QDateTimeEdit" name="date_3">
+                  <property name="geometry">
+                   <rect>
+                    <x>10</x>
+                    <y>70</y>
+                    <width>211</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                  <property name="font">
+                   <font>
+                    <pointsize>12</pointsize>
+                   </font>
+                  </property>
+                 </widget>
+                 <widget class="QComboBox" name="choose_2">
+                  <property name="geometry">
+                   <rect>
+                    <x>10</x>
+                    <y>130</y>
+                    <width>211</width>
+                    <height>51</height>
+                   </rect>
+                  </property>
+                 </widget>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPlainTextEdit" name="write_2"/>
+               </item>
+              </layout>
+             </widget>
             </widget>
-           </widget>
-          </widget>
-          <widget class="QTableWidget" name="tableWidget_13">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>10</y>
-             <width>961</width>
-             <height>401</height>
-            </rect>
-           </property>
-          </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="viewnote">
+             <property name="minimumSize">
+              <size>
+               <width>260</width>
+               <height>250</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>260</width>
+               <height>250</height>
+              </size>
+             </property>
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="title">
+              <string> Просмотр заметки</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+             </property>
+             <widget class="QWidget" name="default4" native="true">
+              <property name="geometry">
+               <rect>
+                <x>10</x>
+                <y>20</y>
+                <width>241</width>
+                <height>221</height>
+               </rect>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">QPushButton {
+    padding:10px;
+    color: #fffff;
+    font-size: 18px;
+    border-radius: 10px;
+    border: 1px solid #3873d9;
+    background-color: white; }
+
+QPushButton:before {
+	content:'';
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 0;
+	height: 42px;
+	background: rgba(255,255,255,0.3);
+	border-radius: 5px;
+	transition: all 2s ease;
+}
+
+QPushButton:hover:before {
+	width: 100%;
+}</string>
+              </property>
+              <widget class="QComboBox" name="choosedate">
+               <property name="geometry">
+                <rect>
+                 <x>10</x>
+                 <y>10</y>
+                 <width>221</width>
+                 <height>31</height>
+                </rect>
+               </property>
+               <property name="font">
+                <font>
+                 <pointsize>10</pointsize>
+                 <weight>75</weight>
+                 <bold>true</bold>
+                </font>
+               </property>
+               <item>
+                <property name="text">
+                 <string>За всё время</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>За месяц</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>За неделю</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>На опред. дату</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>На опред. время</string>
+                </property>
+               </item>
+              </widget>
+              <widget class="QPushButton" name="showing">
+               <property name="geometry">
+                <rect>
+                 <x>10</x>
+                 <y>170</y>
+                 <width>221</width>
+                 <height>41</height>
+                </rect>
+               </property>
+               <property name="font">
+                <font>
+                 <pointsize>-1</pointsize>
+                </font>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">QPushButton {
+    padding:10px;
+    color: #fffff;
+    font-size: 18px;
+    border-radius: 10px;
+    border: 1px solid #3873d9;
+    background-color: white; }
+
+QPushButton:hover{
+	background-color: rgb(171, 211, 247);
+	effect = QtWidgets.QGraphicsDropShadowEffect(QPushButton)
+	effect.setOffset(0, 0)
+	effect.setBlurRadius(20)
+	effect.setColor(QColor(57, 219, 255))
+	QPushButton.setGraphicsEffect(effect)
+}</string>
+               </property>
+               <property name="text">
+                <string>Показать</string>
+               </property>
+              </widget>
+             </widget>
+            </widget>
+           </item>
+          </layout>
          </widget>
         </item>
        </layout>
diff --git a/table.db b/table.db
index dd0332a88ec060175da3358a888e7ee36875082a..77524f9c6a0a1d752098c6ebf95b7e0b46853758 100644
GIT binary patch
delta 938
zcmZ`%O=uHA6n@)nqFK$nB-<KW-2606+Jdb~MDPzOLhDIdu;A5|O-x&D(WLZZO@Htp
z3T+jopxENiNrbc^G^Sd5iXaHH;Gu#CFXBN&LFm~xn=}N$nVp%PZ{GL4@9pgLmNdO3
zEwnaB(Zxe&?NSta2Bubx6+De>&4!ooCLX{6{ElUOg(q<dZET1AU|-pLw#IJ#ujhlV
zGc1e8VG83kPhyPb>ml8kG<4A?4chBrTE!!}PQYL&t*f0fbn``C<ePkhMxGbVd2fdd
z$M}LdW6qk>1iqv3Rvb7YGPLj|exE;cgvIMqqCRrA%Mj!*vm|0gVMvBBU$&?PUNUC`
z9vRN@1=7h=k|KX&&hV001LizmH}CQiK2(Fk$ZNvujG!izUQp;djS|nbI%GJ-SIjx`
z_OC|Ps|edqc+Q;V1+pSmiv<AgHW|A3k|>F9k~1o%B_P9zs(8tq;~VBZs&|eKbAG=J
zeN^14d50G)&KlWTrvh>`ioD?UiBykChEfRzF;$D|q+~K~H{dpY!=1dl_X9rIKC(aF
z>1>q!QfByCBBNivn%D!d*Cu-%W8;}b+KEB1vvLnQ*dO)<H(42PBd1Hvv22rVAE=Vm
z0QzqXD;~|!p)|`iRDz2ML(#N0#nax@P=f)6CK5^@sI`Tfr5Y;1`SCGL^Z7iAAL$ox
zs}lJY?Sh_(V5JR$ORazaS&Fa1h*#<kNPQPy245}S3TJjoSXEHPd)2;`B%(MvE6ie@
z9MypM6X@VK;AgO_Qd6TK_E)Jxsfn;Z67eY{OF_TtoQsNf?Yb*zsVMqX2gO~0iwK|S
v9zJ5%;b31p8jp3yV%<lhBSvyGZHy$-MlzK)MpLv)8MGToO(dVYdtHA4`#dmG

delta 363
zcmYjMJxjw-6umDm$%}216R{$wpua%DpWxso7Fuv{N=(vJV~S1VM-l8#XmN7uPq1_r
zvbi`ETsk<obd?T*qrO&<TrS*m?&Y3yZ#QGzjP=$PviqC+I@z>ybT{+{C>t0OhIqyc
z-tdkoKJh(T-hRYMfpOY6PrN{;p>SIBlE4cJTy}%7UJrx1P&uu-?o})_38F?b6}kkS
zn^Q*!2`;Z&zAz+6&u&8#U!-6{m|!|$l~+7Wc1wGPsq!t>Zd~|n$BleJL?t8glcX6Z
zCdQ<rL+IcGJq+-K3}bnmhx;-s(h6H*^Pt0KtZ-G+42#RIlvu>E?^$Y&*TU4&a{Qpx
qu=E_SI&I9z{@<^rv8CkZwbYloe{*y0AZ-`bmhb#vWLIYBSBk#|7)r1J