Подгонка под РПЗ

App/Report/sql/sellers_report.sql

@@ -1,8 +1,9 @@
 SELECT
     s.name AS Поставщик,
-    SUM(reports.count) AS 'Количество поставок',
-    SUM(reports.sum) AS Сумма
+    reports.sum AS 'Сумма в рублях',
+    reports.count AS 'Количество поставок'
 FROM reports
 JOIN sellers s ON reports.item_id = s.sel_id
 WHERE report_category_id = '$id' AND (month = '$month' AND year = '$year')
-GROUP BY s.name;
+GROUP BY s.name
+ORDER BY s.name;

App/Report/sql/workpiece_report.sql

@@ -1,8 +1,8 @@
 SELECT w.name AS Наименование, 
-    w.material AS Материал,
-    sum(sum) AS Сумма, 
-    sum(reports.count) AS Количество 
+    reports.sum AS 'Сумма в рублях', 
+    reports.count AS 'Количество поставленных заготовок'
     from reports
 JOIN workpiece w ON reports.item_id = w.work_id
 WHERE report_category_id = '$id' AND (month = '$month' AND year = '$year')
-GROUP BY w.material, w.name;
+GROUP BY w.material, w.name
+ORDER BY w.name;

App/Requests/README.md

@@ -1 +0,0 @@
-# Переделать первый запрос (поставки конкретной заготовки формата "кем - когда - количество")

App/Requests/sql/ship_seller.sql

@@ -1,4 +1,5 @@
-SELECT w.waybill_date AS 'Дата поставки',
+SELECT DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки', 
+       TIME_FORMAT(w.waybill_date, '%H:%i') AS 'Время поставки', 
        SUM(w.total) AS 'Общая сумма (в рублях)',
        SUM(wl.amount) as 'Общее количество заготовок' 
 FROM waybill w

App/Requests/templates/zagotovki.html

@@ -35,7 +35,7 @@
                 <label>Выберите заготовку</label>
                 <select class="form-select" name="workpiece">
                     {% for item in materials %}
-                        <option value="{{ item["work_id"] }}">{{ item["name"] }} - {{ item["material"] }}</option>
+                        <option value="{{ item["work_id"] }}">{{ item["name"] }}</option>
                     {% endfor %}
                 </select>
                 <button type="submit" class="btn btn-primary">Отправить</button>