A

back/infa.go

@@ -44,7 +44,8 @@ func prepareInfa() []string {
 		elist = append(elist, "[Select@TimeRecord@Times] - "+e.Error())
 	}
 
-	queries["Select#Order#"], e = db.Prepare(`SELECT o."ID", o."Name", o."Passport", o."Phone", o."Cause", a."Date", a."Time" FROM "Record" AS o INNER JOIN "TimeRecord" AS a ON o."ID"=a."Record"
+	queries["Select#Order#"], e = db.Prepare(`SELECT o."ID", o."Name", o."Passport", o."Phone", o."Cause", a."Date", a."Time" 
+	FROM "Record" AS o INNER JOIN "TimeRecord" AS a ON o."ID"=a."Record" WHERE a."Date"=$1
 	ORDER BY a."Date" ASC, a."Time"`)
 	if e != nil {
 		elist = append(elist, "Select#Order#"+e.Error())

back/pg.go

@@ -30,10 +30,8 @@ func initPostgreSQL() {
 func prerareQueries() {
 	var ebox []string
 
-	ebox = append(ebox, prepareQueriesMenu()...)
 	ebox = append(ebox, prepareQueriesManager()...)
 	ebox = append(ebox, prepareQueriesMaterial()...)
-	ebox = append(ebox, prepareQueriesDocument()...)
 	ebox = append(ebox, prepareQueriesSession()...)
 	ebox = append(ebox, prepareInfa()...)
 

back/router.go

@@ -39,7 +39,6 @@ func init() {
 	month["11"] = " ноября "
 	month["12"] = " декабря "
 
-	prepareMenu()
 	prepareNews()
 	prepareNewsPagination()
 	prepareNotice()
@@ -115,9 +114,7 @@ func init() {
 
 	router.NoRoute(handlerNoRoute)
 
-	prepareRouterMenu()
 	prepareRouterMaterial()
-	prepareRouterDocument()
 
 	// buildTimeRecord()
 }
@@ -423,32 +420,6 @@ func handleSetMaterialList(c *gin.Context) {
 	})
 }
 
-// func handleGetMaterialList(c *gin.Context) {
-// 	man := getManagerFromContext(c)
-
-// 	if man.Role != "__admin" {
-// 		c.JSON(200, gin.H{
-// 			"Error": errorAccessRestricted,
-// 		})
-// 		return
-// 	}
-
-// 	m := informationMass{}
-
-// 	e := m.Select()
-// 	if e != nil {
-// 		c.JSON(200, gin.H{
-// 			"Error": e.Error(),
-// 		})
-// 		return
-// 	}
-
-// 	c.JSON(200, gin.H{
-// 		"Error": nil,
-// 		"Link":  m.Rows,
-// 	})
-// }
-
 type timerecord struct {
 	Date   string
 	Time   int64
@@ -562,7 +533,17 @@ func handlerSelectOrder(c *gin.Context) {
 
 	m := record{}
 
-	e := m.Select()
+	e := c.BindJSON(&m)
+	if e != nil {
+		fmt.Println(e)
+
+		c.JSON(200, gin.H{
+			"Error": e.Error(),
+		})
+		return
+	}
+
+	e = m.Select()
 	if e != nil {
 		fmt.Println(e)
 
@@ -585,7 +566,7 @@ func (m *record) Select() error {
 		return errors.New("Запрос Select#Order# не найден")
 	}
 
-	rows, e := stmt.Query()
+	rows, e := stmt.Query(m.Date)
 	if e != nil {
 		return e
 	}

front/asset/css/zapis.css

@@ -1 +0,0 @@
-.zap{padding-left:5px;padding-top:5px}.voice{width:170px;-webkit-border-radius:4px;border-radius:4px;background-color:#b9f6ca;margin-bottom:20px;padding-left:5px;padding-top:5px}

front/html/PageZap.html

@@ -1,7 +1,13 @@
 {{define "PageZap"}}
 
+<i onclick="printTable()" class="fas fa-print prnt"></i></button>
 <table id="ManageOrderPacient"></table>
-
+<div class="filt"> 
+    <p> Выберите дату для отображения списка
+    </p>
+    <p>
+        <input type="date" id="OrderListDate">
+</div>
 
 <script>
 let times = [
@@ -12,19 +18,24 @@ let times = [
     "15:24",
 ];
 
-    document.addEventListener("DOMContentLoaded", function () {
+    document.addEventListener("DOMContentLoaded", function() {
+        /**
+         * 
+         * @type {HTMLInputElement}
+         */
+        let OrderListDate = document.querySelector("#OrderListDate");
+        if (OrderListDate) {
+            OrderListDate.onchange = getOrderList;
+            OrderListDate.value = (new Date()).toISOString().slice(0, 10);
+            OrderListDate.dispatchEvent(new MouseEvent("change"));
+        }
+    });
+    function getOrderList() {
         VKKOWork.XHR.POST(function (data) {
-            if (data != null && "Data" in data && data.Data != null) {
-                data = data.Data;
-            } else {
-                VKKOWork.Messenger.Show("Данные не были получены");
-                return;
-            }
-
             /**
              * @type {HTMLTableElement}
              */
-            var ManageOrderPacient = document.querySelector(
+             var ManageOrderPacient = document.querySelector(
                 "#ManageOrderPacient"
             );
 
@@ -32,6 +43,13 @@ let times = [
                 ManageOrderPacient.children[0].remove();
             }
 
+            if (data != null && "Data" in data && data.Data != null) {
+                data = data.Data;
+            } else {
+                VKKOWork.Messenger.Show("Данные не были получены");
+                return;
+            }
+
             //o."ID", o."Name", o."Passport", o."Phone", o."Cause", a."Date", a."Time"
 
             ManageOrderPacient.innerHTML =
@@ -57,8 +75,9 @@ let times = [
                 ManageOrderPacient.append(row);
             }
             ManageOrderPacient.selectedIndex = -1;
-        }, "/order-select");
-    });
+        }, "/order-select", {Date: this.value});
+    }
 </script>
 
+
 {{end}}

front/html/index.html

@@ -3,35 +3,15 @@
 
 <head>
 	<meta charset="UTF-8" />
-	<meta name="viewport"
-		content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
-
+	<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
 	<link rel="shortcut icon" href="/img/VKo.ico" type="image/x-icon" />
-
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/messenger.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/main.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/icon.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/controls.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/modal.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/media-mobile.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/media-tablet.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/media-desktop.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/zapis.css" />
-
-
+	<link rel="stylesheet" href="/css/{{.ServerVersion}}/app.css" />
 	<!-- adm -->
-	{{if eq .IsAdmin true}}
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/menu-editor.css" />
+	{{if eq .IsAdmin true}}<link rel="stylesheet" href="/css/{{.ServerVersion}}/menu-editor.css" />
 	<link rel="stylesheet" href="/css/{{.ServerVersion}}/material-editor.css" />
-	<link rel="stylesheet" href="/css/{{.ServerVersion}}/admin.css" />
-	{{end}}
-
-<!-- secreter -->
-{{if eq .isSecreter true}}
-<link rel="stylesheet" href="/css/{{.ServerVersion}}/admin.css" />
-{{end}}
-
-
+	<link rel="stylesheet" href="/css/{{.ServerVersion}}/admin.css" />{{end}}
+	<!-- secreter -->
+	{{if eq .isSecreter true}}<link rel="stylesheet" href="/css/{{.ServerVersion}}/admin.css" />{{end}}
 	<title>Военный коммиссариат Курганской области</title>
 </head>
 
@@ -78,6 +58,7 @@
 						<a class="tool-button" style="text-decoration: none;" id="CreateNewsButton" href="/page/PageZap" >
 							<i class="fas fa-clipboard-list"></i>
 							Посетители</a>
+							
 						
 					</div>
 				</div>
@@ -95,6 +76,7 @@
 				</div>
 				<div class="text-center">
 					<div class="normal"><b>Запись на приём</b></div>
+					<div style="font-size: 0.9rem;margin-top:5px">В кабинет 8а к НО ППГВС</div>
 				</div>
 			</a>
 
@@ -184,20 +166,30 @@
 				<div class="published">{{.Page.Published}}</div>
 				{{.Page.Content}}
 				{{else}}
-				{{if eq .Page "404"}}
-				{{template "404"}}{{else}}
-				{{if eq .Page "position"}}{{template "position"}}{{else}}
-				{{if eq .Page "BigBoss"}}{{template "BigBoss"}}{{else}}
-				{{if eq .Page "Zapis"}}{{template "Zapis"}}
-				{{else}}
-				{{if eq .Page "Mass"}}{{template "Mass" .}}
-				{{end}}
-				{{if eq .Page "PageZap"}}{{template "PageZap" .}}
-				{{end}}
-				{{end}}
-				{{end}}
-				{{end}}
-				{{end}}
+					{{if eq .Page "404"}}
+						{{template "404"}}
+					{{else}}
+						{{if eq .Page "position"}}
+							{{template "position"}}
+						{{else}}
+							{{if eq .Page "BigBoss"}}
+								{{template "BigBoss"}}
+							{{else}}
+								{{if eq .Page "Zapis"}}
+									{{template "Zapis"}}
+								{{else}}
+									{{if eq .Page "Mass"}}
+										{{template "Mass" .}}
+									{{else}}
+										{{if eq .Page "PageZap"}}
+											{{template "PageZap" .}}
+										
+										{{end}}
+									{{end}}
+								{{end}}
+							{{end}}
+						{{end}}
+					{{end}}
 				{{end}}
 			</article>
 			{{end}}
@@ -260,8 +252,8 @@
 			VKKO.Main.Init();
 		});
 	</script>
-	<script src="/js/{{.ServerVersion}}/fslightbox.js"></script>
+	<!-- <script src="/js/{{.ServerVersion}}/fslightbox.js"></script> -->
 	<script src="/js/{{.ServerVersion}}/app.js"></script>
 </body>
 
-</html>
+</html>

front/scss/main.scss

@@ -572,3 +572,7 @@ table{
         vertical-align: top;
     }
 }
+
+.prnt{
+	
+}

front/scss/zapis.scss

@@ -11,3 +11,8 @@
     padding-top: 5px;
 
 }
+.prnt{
+    width: 1rem;
+
+    margin-left: auto;
+}