change

index.js

@@ -5,31 +5,80 @@ const {
 } = require('express');
 const app = express();
 
-const today = new Date()
-const day = today.getDate();
-const month = today.getMonth()+1;
-const year = today.getFullYear();
 
-const { json } = require("body-parser");
+
-const { pathToFileURL } = require("url");
+const {
+    json
+} = require("body-parser");
+const {
+    pathToFileURL
+} = require("url");
 
 app.set('view engine', 'ejs');
-app.use(express.urlencoded({extended: false}));
+app.use(express.urlencoded({
+    extended: false
+}));
 app.use(express.static('public'));
 
 const fs = require('fs');
 
+let today = new Date()
+today.setHours(today.getHours() + 5);
+
+setInterval(function() {
+    let timeu = new Date();
+    timeu.setHours(timeu.getHours() + 5);
+    const last = today;
+    let sec = today.getDate();
+    let secu = timeu.getDate();
+    // console.log(sec, secu);
+    if (sec != secu) {
+        let pill = `[0]`;
+        let comment = "";
+        fs.readFile('./pills.json', 'utf8', (err, data) => {
+            let jdata = JSON.parse(data);
+            let num = j_max(jdata) + 1;
+            let name = `pill_${num}`;
+            let c_date = get_date(last);
+            jwrite_pill(name, pill, c_date, comment);
+        })
+        console.log(pill);
+        today = timeu;
+        console.log(today, timeu, last);
+    }
+}, 1000);
+
+function get_date(time) {
+
+    // today.setHours(today.getHours() + 5);
+
+    let day = time.getDate();
+    let month = time.getMonth() + 1;
+    let year = time.getFullYear();
+
+    // console.log(day.toString().length);
+    // console.log(month.toString().length);
+    day = (day.toString().length <= 1) ? `0${day}` : day;
+    month = (month.toString().length <= 1) ? `0${month}` : month;
+
+    return `${day}.${month}.${year}`;
+}
+
 
 app.get('/user', (req, res) => {
     fs.readFile('./pills.json', 'utf8', (err, data) => {
         let jdata = JSON.parse(data);
-        res.render(`user`, { data: dict_reverse(jdata)});
+        res.render(`user`, {
+            data: dict_reverse(jdata)
+        });
     })
 })
 app.get('/', (req, res) => {
     res.redirect("/user");
 })
 
+console.log(get_date(today));
+
 function dict_reverse(obj) {
     new_obj = {}
     rev_obj = Object.keys(obj).reverse();
@@ -49,25 +98,28 @@ app.post('/scripts',(req,res) => {
             let jdata = JSON.parse(data);
             let num = j_max(jdata) + 1;
             let name = `pill_${num}`;
-            let c_date = `${day}.${month}.${year}`;
+            let c_date = get_date(today);
             jwrite_pill(name, pill, c_date, comment);
         })
         console.log(pill);
-    }
+    } else if (inp["func"] == "del") {
-    else if(inp["func"]=="del"){
         let pill = inp["pill"];
         fs.readFile('./pills.json', 'utf8', (err, data) => {
             let jdata = JSON.parse(data);
             delete jdata[pill];
             jwrite(jdata);
         })
-    }
+    } else if (inp["func"] == "edit" && inp["mode"] == "save") {
-    else if(inp["func"]=="edit"&&inp["mode"]=="save"){
         let name = inp["name"];
+
         let date = inp["date"];
+        let dates = date.toString().split("-");
+        date = `${dates[2]}.${dates[1]}.${dates[0]}`;
+
         let comment = inp["comment"];
-        let pill = inp["pill"];
+
-        console.log("ecdit");
+        let pill = `[${inp["pill"]}]`;
+        console.log("edit");
         jwrite_pill(name, pill, date, comment);
     }
     res.redirect("/user");
@@ -112,11 +164,19 @@ function jwrite_pill(name,pill,date,comment){
 app.post("/edit", (req, res) => {
     let inp = req.body;
     let name = inp["name"];
-    let pill = inp["pill"];
+    let pill = inp["pill"].replace('[', '').replace(']', "");
     let date = inp["date"];
+
     let comment = inp["comment"];
-    console.log("e");
+    comment = (comment == "-") ? "" : comment;
-    res.render(`edit`, { name:name,pill:pill,comment:comment,date:date});
+
+    console.log("edit");
+    res.render(`edit`, {
+        name: name,
+        pill: pill,
+        comment: comment,
+        date: date
+    });
 })
 
 function j_max(arg) {

views/edit.ejs

@@ -4,10 +4,32 @@
     }
 </style>
 <form action="/scripts" method="post">
+    <% 
+    let dates = date.split(".");
+    let date2 = `${dates[2]}-${dates[1]}-${dates[0]}`;
+    console.log(date2);
+     %>
     <input type="hidden" name="name" value="<%= name %>">
-    <input type="text" name="pill" value="<%= pill %>">
+    <input type="date" name="date" value="<%= date2 %>">
-    <input type="text" name="date" value="<%= date %>">
+    <input type="text" name="comment" value="<%= comment %>" placeholder="comment">
-    <input type="text" name="comment" value="<%= comment %>">
+    <!-- <input type="text" name="pill" value="<%= pill %>"> -->
+    <select id="pills" name="pill">
+        <!-- <option value="4/2">4/2</option>
+        <option value="4">4</option>
+        <option value="2">2</option>
+        <option value="0">0</option> -->
+        <% 
+        let pills = ["4/2","4/1","4","2","2/1","1","0"];
+        let i=0;
+        pills.forEach(el => {
+            let check = (el==pill)? "selected":"";
+            %>
+        <option class="pill" id="pill-<%= i %>" value="<%= el %>" <%= check %>><%= el %></option>
+        <%
+            i++;
+        });
+        %>
+    </select>
     <input type="hidden" name="func" value="edit">
     <input type="submit" name="mode" value="save">
     <input type="submit" name="mode" value="cancel">

views/inputs.ejs

@@ -4,42 +4,47 @@
         display: flex;
         padding-inline: 3px;
     }
+
     .pill input {
         margin: 0px;
         /* padding: 20px; */
     }
+
     .pill label {
         padding-inline: 4px;
         padding-block: 1px;
     }
+
     .pills {
         list-style-type: none;
         display: flex;
     }
+
     .f1 {
         display: flex;
         justify-content: space-evenly;
         margin-block: 15px;
     }
+
     input {
         text-align: center;
     }
 </style>
 <form class="f1" action="/scripts" method="post">
     <input type="submit" value="add">
-    <ul class="pills">
+    <select id="pills" name="pill">
         <% 
         let pills = ["4/2","4/1","4","2","2/1","1","0"];
         let i=0;
         pills.forEach(el => {
-            let check = (el=="4")? "checked":"";
+            let check = (el=="4")? "selected":"";
             %>
-                <li class="pill"><label for="<%= i %>"><%= el %></label> <input id="<%= i %>" type="radio" name="pill" value="<%= el %>" <%= check %>></li>
+        <option class="pill" id="pill-<%= i %>" value="<%= el %>" <%= check %>><%= el %></option>
         <%
             i++;
         });
         %>
-    </ul>
+    </select>
     <input type="text" name="comment" value="" placeholder="comment">
     <input type="hidden" name="func" value="save">
 </form>