v. 2.3

main.py

@@ -11,6 +11,10 @@ if hasattr(QtCore.Qt, 'AA_EnableHighDpiScaling'):
 if hasattr(QtCore.Qt, 'AA_UseHighDpiPixmaps'):
     QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps, True)
 
+# ВСТАВИТЬ В ИНТЕРФЕЙС ПОСЛЕ ФОРМАТИРОВАНИЯ
+# self.setWindowTitle('Icon')
+# self.setWindowIcon(QtGui.QIcon('web.png'))
+
 
 class MyWidget(QMainWindow):  # Ui_MainWindow
     def __init__(self):
@@ -30,12 +34,18 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
         self.check_but3.clicked.connect(self.check)
 
         # ЗАМЕТКИ
-        self.complete.clicked.connect(self.add_notes)  # ДОБАВЛЕНИЕ
+        self.showing.clicked.connect(self.show_note)  # ПОКАЗАТЬ
+        self.complete.clicked.connect(self.check_note)  # ВЫПОЛНИТЬ
+        self.added.clicked.connect(self.add_note)  # ДОБАВЛЕНИЕ
+        self.demonstr.clicked.connect(self.update_note)  # РЕДАКТИРОВАТЬ
+        self.updat.clicked.connect(self.update_note)
 
         # ДАННЫЕ ТАБЛИЦЫ
-        self.table()
+        self.table_rasp()
+        self.table_note()
+        self.table_note_date()
 
-    def table(self):
+    def table_rasp(self):
         try:
             # РАСПИСАНИЕ
             with self.connection:
@@ -78,58 +88,28 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
             except Exception:
                 pass
 
-            # ЗАПОЛНЕНИЕ ВЫПАДАЮЩИХ СПИСКОВ CHOOSE 1 / 2
-            try:
-                with self.connection:
-                    notes = self.cursor.execute('SELECT `note` FROM `notes`').fetchall()
-                notes = [i[0] for i in notes]
-                for choose_obj in [self.choose, self.choose_2]:
-                    choose_obj.clear()
-                    if self.choose == choose_obj:
-                        choose_obj.insertItem(0, "Все за этот день!")
-                        choose_obj.insertItems(1, notes)
-                    else:
-                        choose_obj.insertItems(0, notes)
-            except Exception:
-                pass
-
-            # НАСТРОЙКА ДИСПЛЕЕВ ДАТ
-            now = QtCore.QDateTime.currentDateTime()
-            for date in [self.date_1, self.date_2, self.date_3]:
-                date.setDateTime(now)
-                date.setDateRange(QtCore.QDate.currentDate().addDays(-365), QtCore.QDate.currentDate().addDays(365))
-                if self.date_1 == date:
-                    date.setDisplayFormat("dd.MM.yyyy")
-
-            # ВСЕ ЗАМЕТКИ
-            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()
+                note = self.cursor.execute("SELECT `date`, `day`, `note` FROM notes").fetchall()
             notes = [self.Mon_note, self.Tue_note, self.Wed_note, self.Thu_note, self.Fri_note, self.Sat_note]
 
+            # СОРТИРОВКА ДАТ
+            note = [[dt.datetime.strptime(dat, "%H:%M %d.%m.%Y"), d, nt] for dat, d, nt in note]
+            note.sort()
+            note = [[dt.datetime.strftime(dat, "%d.%m %H:%M "), d, nt] for dat, d, nt in note]
+
             week = {0: [], 1: [], 2: [], 3: [], 4: [], 5: []}
             for i in note:
-                weekday = dt.datetime.weekday(i[0])
+                if i[1] != 6:
-                if weekday != 6:
+                    week[i[1]].append((i[0], i[2]))
-                    week[weekday].append(i)
 
             for write in notes:
                 write.setColumnCount(2)
                 write.setRowCount(0)
                 write.setHorizontalHeaderLabels(["Дата", "Заметка"])
+                header = write.horizontalHeader()
+                header.setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeToContents)
+                header.setSectionResizeMode(1, QtWidgets.QHeaderView.Stretch)
 
                 for i, row in enumerate(week[notes.index(write)]):
                     write.setRowCount(write.rowCount() + 1)
@@ -140,6 +120,61 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
         except Exception:
             QMessageBox.about(self, 'Ошибка!', "Таблица данных не найдена!")
 
+    def table_note(self):
+        try:
+            # ЗАПОЛНЕНИЕ ВЫПАДАЮЩИХ СПИСКОВ CHOOSE 1 / 2
+            try:
+                with self.connection:
+                    notes = self.cursor.execute('SELECT `date`, `note` FROM `notes`').fetchall()
+
+                # СОРТИРОВКА ДАТ
+                notes = [[dt.datetime.strptime(dat, "%H:%M %d.%m.%Y"), nt] for dat, nt in notes]
+                notes.sort()
+                notes = [nt for dat, nt in notes]
+
+                notes = [f"{i + 1}. {nt}" for i, nt in enumerate(notes)]
+                for choose_obj in [self.choose, self.choose_2]:
+                    choose_obj.clear()
+                    choose_obj.insertItems(0, notes)
+            except Exception:
+                pass
+
+            # ВСЕ ЗАМЕТКИ
+            with self.connection:
+                note = self.cursor.execute("SELECT `date`, `note` FROM notes").fetchall()
+
+            # СОРТИРОВКА ДАТ
+            note = [[dt.datetime.strptime(dat, "%H:%M %d.%m.%Y"), nt] for dat, nt in note]
+            note.sort()
+            note = [[dt.datetime.strftime(dat, "%d.%m.%Y %H:%M "), nt] for dat, nt in note]
+
+            maintable = self.maintable
+            maintable.setColumnCount(2)
+            maintable.setRowCount(0)
+            maintable.setHorizontalHeaderLabels(["Дата", "Заметка"])
+            header = maintable.horizontalHeader()
+            header.setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeToContents)
+            header.setSectionResizeMode(1, QtWidgets.QHeaderView.Stretch)
+
+            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)
+        except Exception:
+            QMessageBox.about(self, 'Ошибка!', "Таблица данных не найдена!")
+
+    def table_note_date(self):
+        try:
+            # НАСТРОЙКА ДИСПЛЕЕВ ДАТ
+            now = QtCore.QDateTime.currentDateTime()
+            for date in [self.date_1, self.date_2]:
+                date.setDateTime(now)
+                date.setDateRange(QtCore.QDate.currentDate().addDays(-365), QtCore.QDate.currentDate().addDays(365))
+                date.setDisplayFormat("HH:mm dd.MM.yyyy")
+        except Exception:
+            QMessageBox.about(self, 'Ошибка!', "Неудалось вывести указанное время!")
+
     # РАСПИСАНИЕ
     def add(self):
         day = self.weekday1.currentIndex()
@@ -181,7 +216,7 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
                     choose_obj.clear()
                     choose_obj.insertItem(0, "Новый предмет")
                 self.add_line.clear()
-                self.table()
+                self.table_rasp()
             else:
                 for choose_obj in [self.choose_obj1, self.choose_obj2]:
                     choose_obj.clear()
@@ -198,7 +233,7 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
             with self.connection:
                 self.cursor.execute(f"UPDATE `lessons` SET `name` = ? WHERE `name` = ?", (txt, obj))
             self.upd_line.clear()
-            self.table()
+            self.table_rasp()
         else:
             QMessageBox.about(self, 'Ошибка!', "Вы не ввели новое название!")
 
@@ -212,7 +247,7 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
                     if obj == 0 or obj == less:
                         with self.connection:
                             self.cursor.execute(f"UPDATE `timetable` SET `less_{less}` = ? WHERE `id` = ?", (None, wkd))
-        self.table()
+        self.table_rasp()
 
     def delete(self):
         index = self.choose_obj3.currentText()
@@ -229,7 +264,7 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
                     if ids == lessons[less - 1]:
                         with self.connection:
                             self.cursor.execute(f"UPDATE `timetable` SET `less_{less}` = ? WHERE `id` = ?", (None, day))
-        self.table()
+        self.table_rasp()
 
     def check(self):
         index, sender = self.choose_obj4.currentText(), self.sender().text()
@@ -251,14 +286,108 @@ class MyWidget(QMainWindow):  # Ui_MainWindow
                         elif sender == "Отменить":
                             tables[day - 1].item(less - 1, 0).setBackground(QtGui.QColor(255, 255, 255))
                         else:
-                            self.table()
+                            self.table_rasp()
 
     # ЗАМЕТКИ
-    def add_notes(self):
+    def show_note(self):
-        ind = self.choose.currentIndex()
+        tp = self.choosedate.currentIndex()
-        if ind:
+        if tp == 0:
-            pass
+            self.table_note()
+        elif tp == 1 or tp == 2:
+            with self.connection:
+                note = self.cursor.execute("SELECT `date`, `note` FROM notes").fetchall()
+            maintable = self.maintable
+            maintable.setColumnCount(2)
+            maintable.setRowCount(0)
+            maintable.setHorizontalHeaderLabels(["Дата", "Заметка"])
 
+            if tp == 1:
+                dates = ['.'.join(reversed(str(dt.date.today() + dt.timedelta(days=i)).split('-'))) for i in range(30)]
+            else:
+                dates = ['.'.join(reversed(str(dt.date.today() + dt.timedelta(days=i)).split('-'))) for i in range(7)]
+
+            notes = [i for i in note if i[0][-10:] in dates]
+
+            if notes:
+                for i, row in enumerate(notes):
+                    maintable.setRowCount(maintable.rowCount() + 1)
+                    for j, elem in enumerate(row):
+                        maintable.setItem(i, j, QTableWidgetItem(str(elem)))
+                maintable.horizontalHeader().setStretchLastSection(True)
+            else:
+                QMessageBox.about(self, 'Нет Заметок!', "На данные даты заметки отсутствуют!")
+
+    def check_note(self):
+        note = self.choose.currentText()
+        if note:
+            ids = note.split(".")[0]
+
+            with self.connection:
+                notes = self.cursor.execute("SELECT `id` FROM `notes`").fetchall()
+            ids = notes[int(ids) - 1][0]
+
+            with self.connection:
+                self.cursor.execute("DELETE FROM `notes` WHERE `id` = ?", (ids, ))
+            self.table_rasp()  # после вёрстки удалить !!!
+            self.table_note()
+        else:
+            QMessageBox.about(self, 'Нет заметки!', "Чтобы выполнить заметку, необходимо её хотя бы иметь!")
+
+    def add_note(self):
+        date = self.date_1.dateTime().toString("HH:mm dd.MM.yyyy")
+        txt = self.write.toPlainText()
+        day = self.date_1.dateTime().toString()[:2]
+
+        if txt:
+            for i, elem in enumerate(["Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"]):
+                if day == elem:
+                    day = i
+                    break
+            with self.connection:
+                self.cursor.execute("INSERT INTO `notes` (`date`, `day`, `note`) VALUES(?,?,?)", (date, day, txt))
+            self.table_rasp()  # после вёрстки удалить !!!
+            self.table_note()
+        else:
+            QMessageBox.about(self, 'Отсутствует информация!',
+                              "Для добавления заметки вы должны заполнить текстовое поле!")
+
+    def update_note(self):
+        sender = self.sender().text()
+        z = self.choose_2.currentText()
+        if z:
+            ids = z.split(".")[0]
+
+            with self.connection:
+                notes = self.cursor.execute("SELECT `id` FROM `notes`").fetchall()
+            ids = notes[int(ids) - 1][0]
+
+            if sender == "Показать":
+                with self.connection:
+                    note = self.cursor.execute(f"SELECT `date`, `note` FROM notes WHERE `id` = {ids}").fetchone()
+
+                # ОТОБРАЖЕНИЕ ДАТЫ ИЗ БАЗЫ
+                datetime = note[0].split()
+                time = datetime[0].split(":")
+                date = datetime[1].split('.')
+                now = QtCore.QDateTime(int(date[2]), int(date[1]), int(date[0]), int(time[0]), int(time[1]))
+                self.date_2.setDateTime(now)
+
+                self.write_2.setPlainText(note[1])
+            elif sender == "Обновить":
+                date = self.date_2.dateTime().toString("HH:mm dd.MM.yyyy")
+                txt = self.write_2.toPlainText()
+
+                with self.connection:
+                    self.cursor.execute(f"UPDATE `notes` SET `date` = ?, `note` = ? WHERE `id` = ?", (date, txt, ids))
+
+                self.write_2.clear()
+                self.table_rasp()  # после вёрстки удалить !!!
+                self.table_note()
+                self.table_note_date()
+        else:
+            QMessageBox.about(self, 'Нет заметки!', "Чтобы изменить заметку, необходимо её хотя бы иметь!")
+
+    # ЗАКРЫТИЕ ОКНА
     def closeEvent(self, event):
         self.connection.close()
 

rasp.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1192</width>
+    <width>1069</width>
-    <height>809</height>
+    <height>813</height>
    </rect>
   </property>
   <property name="font">
@@ -23,8 +23,8 @@
    <string notr="true"/>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <layout class="QGridLayout" name="gridLayout_3">
-    <item>
+    <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="font">
        <font>
@@ -385,6 +385,48 @@
            <item>
             <widget class="QWidget" name="fake2" native="true"/>
            </item>
+           <item>
+            <widget class="QPushButton" name="get_note">
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>40</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>16777215</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>
            <item>
             <widget class="QGroupBox" name="Check">
              <property name="minimumSize">
@@ -893,8 +935,6 @@ QPushButton:hover{
                  <property name="font">
                   <font>
                    <pointsize>-1</pointsize>
-                   <weight>50</weight>
-                   <bold>false</bold>
                   </font>
                  </property>
                  <property name="styleSheet">
@@ -987,8 +1027,6 @@ QPushButton:hover{
                  <property name="font">
                   <font>
                    <pointsize>-1</pointsize>
-                   <weight>50</weight>
-                   <bold>false</bold>
                   </font>
                  </property>
                  <property name="styleSheet">
@@ -1188,8 +1226,8 @@ QPushButton:hover{
        <attribute name="title">
         <string>Заметки</string>
        </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_6">
+       <layout class="QGridLayout" name="gridLayout_2">
-        <item>
+        <item row="0" column="0">
          <widget class="QTableWidget" name="maintable">
           <property name="maximumSize">
            <size>
@@ -1197,9 +1235,14 @@ QPushButton:hover{
             <height>16777215</height>
            </size>
           </property>
+          <property name="font">
+           <font>
+            <pointsize>10</pointsize>
+           </font>
+          </property>
          </widget>
         </item>
-        <item>
+        <item row="1" column="0">
          <widget class="QWidget" name="widget" native="true">
           <property name="minimumSize">
            <size>
@@ -1236,6 +1279,129 @@ QPushButton:hover{
              <property name="currentIndex">
               <number>0</number>
              </property>
+             <widget class="QWidget" name="Show">
+              <attribute name="title">
+               <string>Показать</string>
+              </attribute>
+              <layout class="QHBoxLayout" name="horizontalLayout_6">
+               <item>
+                <widget class="QWidget" name="widget_3" native="true">
+                 <property name="minimumSize">
+                  <size>
+                   <width>231</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>231</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_20">
+                  <item>
+                   <widget class="QPushButton" name="showing">
+                    <property name="minimumSize">
+                     <size>
+                      <width>211</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>211</width>
+                      <height>51</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>
+                  <item>
+                   <widget class="QWidget" name="fake9" native="true"/>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <widget class="QWidget" name="widget_5" native="true">
+                 <layout class="QVBoxLayout" name="verticalLayout_21">
+                  <item>
+                   <widget class="QComboBox" name="choosedate">
+                    <property name="minimumSize">
+                     <size>
+                      <width>0</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>16777215</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="font">
+                     <font>
+                      <pointsize>11</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>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QWidget" name="fake10" native="true"/>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+              </layout>
+             </widget>
              <widget class="QWidget" name="Doing">
               <attribute name="title">
                <string>Сделать</string>
@@ -1255,6 +1421,12 @@ QPushButton:hover{
                    <height>16777215</height>
                   </size>
                  </property>
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
                  <layout class="QVBoxLayout" name="verticalLayout_13">
                   <item>
                    <widget class="QPushButton" name="complete">
@@ -1270,6 +1442,11 @@ QPushButton:hover{
                       <height>51</height>
                      </size>
                     </property>
+                    <property name="font">
+                     <font>
+                      <pointsize>-1</pointsize>
+                     </font>
+                    </property>
                     <property name="styleSheet">
                      <string notr="true">QPushButton {
     padding:10px;
@@ -1293,38 +1470,6 @@ QPushButton:hover{
                     </property>
                    </widget>
                   </item>
-                  <item>
-                   <widget class="QDateTimeEdit" name="date_1">
-                    <property name="minimumSize">
-                     <size>
-                      <width>211</width>
-                      <height>51</height>
-                     </size>
-                    </property>
-                    <property name="maximumSize">
-                     <size>
-                      <width>211</width>
-                      <height>51</height>
-                     </size>
-                    </property>
-                    <property name="font">
-                     <font>
-                      <pointsize>12</pointsize>
-                      <weight>50</weight>
-                      <bold>false</bold>
-                     </font>
-                    </property>
-                    <property name="layoutDirection">
-                     <enum>Qt::LeftToRight</enum>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignCenter</set>
-                    </property>
-                    <property name="buttonSymbols">
-                     <enum>QAbstractSpinBox::UpDownArrows</enum>
-                    </property>
-                   </widget>
-                  </item>
                   <item>
                    <widget class="QWidget" name="fake4" native="true"/>
                   </item>
@@ -1348,6 +1493,11 @@ QPushButton:hover{
                       <height>51</height>
                      </size>
                     </property>
+                    <property name="font">
+                     <font>
+                      <pointsize>11</pointsize>
+                     </font>
+                    </property>
                    </widget>
                   </item>
                   <item>
@@ -1371,6 +1521,12 @@ QPushButton:hover{
                    <height>0</height>
                   </size>
                  </property>
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
                  <layout class="QVBoxLayout" name="verticalLayout_3">
                   <item>
                    <widget class="QPushButton" name="added">
@@ -1389,8 +1545,6 @@ QPushButton:hover{
                     <property name="font">
                      <font>
                       <pointsize>-1</pointsize>
-                      <weight>50</weight>
-                      <bold>false</bold>
                      </font>
                     </property>
                     <property name="styleSheet">
@@ -1417,7 +1571,7 @@ QPushButton:hover{
                    </widget>
                   </item>
                   <item>
-                   <widget class="QDateTimeEdit" name="date_2">
+                   <widget class="QDateTimeEdit" name="date_1">
                     <property name="minimumSize">
                      <size>
                       <width>211</width>
@@ -1466,9 +1620,15 @@ QPushButton:hover{
                    <height>0</height>
                   </size>
                  </property>
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
                  <layout class="QVBoxLayout" name="verticalLayout_19">
                   <item>
-                   <widget class="QPushButton" name="update">
+                   <widget class="QPushButton" name="demonstr">
                     <property name="minimumSize">
                      <size>
                       <width>211</width>
@@ -1481,174 +1641,6 @@ QPushButton:hover{
                       <height>51</height>
                      </size>
                     </property>
-                    <property name="font">
-                     <font>
-                      <pointsize>-1</pointsize>
-                      <weight>50</weight>
-                      <bold>false</bold>
-                     </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>
-                  <item>
-                   <widget class="QDateTimeEdit" name="date_3">
-                    <property name="minimumSize">
-                     <size>
-                      <width>211</width>
-                      <height>51</height>
-                     </size>
-                    </property>
-                    <property name="maximumSize">
-                     <size>
-                      <width>211</width>
-                      <height>51</height>
-                     </size>
-                    </property>
-                    <property name="font">
-                     <font>
-                      <pointsize>12</pointsize>
-                      <weight>50</weight>
-                      <bold>false</bold>
-                     </font>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QComboBox" name="choose_2">
-                    <property name="minimumSize">
-                     <size>
-                      <width>211</width>
-                      <height>51</height>
-                     </size>
-                    </property>
-                    <property name="maximumSize">
-                     <size>
-                      <width>211</width>
-                      <height>51</height>
-                     </size>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QWidget" name="fake8" native="true"/>
-                  </item>
-                 </layout>
-                </widget>
-               </item>
-               <item>
-                <widget class="QPlainTextEdit" name="write_2"/>
-               </item>
-              </layout>
-             </widget>
-            </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>
-             <layout class="QVBoxLayout" name="verticalLayout_20">
-              <item>
-               <widget class="QComboBox" name="choosedate">
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>31</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>31</height>
-                 </size>
-                </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>
-               </widget>
-              </item>
-              <item>
-               <widget class="QWidget" name="fake9" native="true"/>
-              </item>
-              <item>
-               <widget class="QPushButton" name="showing">
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>41</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>16777215</width>
-                  <height>41</height>
-                 </size>
-                </property>
                     <property name="font">
                      <font>
                       <pointsize>-1</pointsize>
@@ -1677,9 +1669,201 @@ QPushButton:hover{
                     </property>
                    </widget>
                   </item>
+                  <item>
+                   <widget class="QComboBox" name="choose_2">
+                    <property name="minimumSize">
+                     <size>
+                      <width>211</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>211</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="font">
+                     <font>
+                      <pointsize>11</pointsize>
+                      <weight>75</weight>
+                      <bold>true</bold>
+                     </font>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QDateTimeEdit" name="date_2">
+                    <property name="minimumSize">
+                     <size>
+                      <width>211</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>211</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="font">
+                     <font>
+                      <pointsize>12</pointsize>
+                      <weight>50</weight>
+                      <bold>false</bold>
+                     </font>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QWidget" name="fake8" native="true"/>
+                  </item>
                  </layout>
                 </widget>
                </item>
+               <item>
+                <widget class="QPlainTextEdit" name="write_2"/>
+               </item>
+               <item>
+                <widget class="QWidget" name="default4" native="true">
+                 <property name="minimumSize">
+                  <size>
+                   <width>160</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <weight>50</weight>
+                   <bold>false</bold>
+                  </font>
+                 </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_22">
+                  <item>
+                   <widget class="QWidget" name="fake11" native="true"/>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="updat">
+                    <property name="minimumSize">
+                     <size>
+                      <width>140</width>
+                      <height>51</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>140</width>
+                      <height>51</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>
+              </layout>
+             </widget>
+            </widget>
+           </item>
+           <item>
+            <widget class="QWidget" name="default5" native="true">
+             <property name="minimumSize">
+              <size>
+               <width>231</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>231</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="font">
+              <font>
+               <weight>50</weight>
+               <bold>false</bold>
+              </font>
+             </property>
+             <widget class="QPushButton" name="get_rasp">
+              <property name="geometry">
+               <rect>
+                <x>10</x>
+                <y>10</y>
+                <width>211</width>
+                <height>51</height>
+               </rect>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>211</width>
+                <height>51</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>211</width>
+                <height>51</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>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -1699,6 +1883,11 @@ QPushButton:hover{
     <string>&amp;Sign in</string>
    </property>
   </action>
+  <action name="file">
+   <property name="text">
+    <string>Путь к файлу Таблицы</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>