new page edited

CSedat · Oct 14, 2022 · eb174fe · eb174fe
1 parent 95d48c1
commit eb174fe
Show file tree

Hide file tree

Showing 4 changed files with 214 additions and 125 deletions.
diff --git a/server/laboratuvar/data.json b/server/laboratuvar/data.json
@@ -1 +1 @@
-[{"id":1,"slurry":"272","time":"13/10/2022","vardiya":"V1","nemdata":{"id":1,"bos1":100,"bos2":100,"numune1":100,"numune2":100,"sontart1":190,"sontart2":191,"hesaplanannem1":"10.00","hesaplanannem2":"9.00","ortnem":"9.50","fark":"1.00"},"yogunluk":2},{"id":2,"slurry":"142","time":"12/10/2022","vardiya":"V3","nemdata":{"id":2,"bos1":2,"bos2":2,"numune1":2,"numune2":2,"sontart1":2,"sontart2":2,"hesaplanannem1":"100.00","hesaplanannem2":"100.00","ortnem":"100.00","fark":"0.00"}},{"id":3,"slurry":"0","time":"12/10/2022","vardiya":"V3","nemdata":{}},{"id":4,"slurry":"0","time":"12/10/2022","vardiya":"V3","nemdata":{}}]
+[{"time":"14/10/2022","vardiya":"V1","slurry":"425","id":1,"nemdata":{"id":1,"bos1":100,"bos2":100,"numune1":100,"numune2":100,"sontart1":110,"sontart2":110,"hesaplanannem1":"90.00","hesaplanannem2":"90.00","ortnem":"90.00","fark":"0.00","saved":true},"yogunluk":1.1},{"time":"13/10/2022","vardiya":"Toplam","slurry":559,"id":2,"nemdata":{},"yogunluk":null},{"time":"13/10/2022","vardiya":"V3","slurry":"164","id":3,"nemdata":{"id":3,"bos1":50,"bos2":50,"numune1":50,"numune2":50,"sontart1":50,"sontart2":49.5,"hesaplanannem1":"100.00","hesaplanannem2":"101.00","ortnem":"100.50","fark":"1.00","saved":true},"yogunluk":null},{"time":"13/10/2022","vardiya":"V2","slurry":"123","id":4,"nemdata":{"id":4,"bos1":70,"bos2":70,"numune1":70,"numune2":70,"sontart1":90,"sontart2":89.5,"hesaplanannem1":"71.43","hesaplanannem2":"72.14","ortnem":"71.78","fark":"0.71","saved":true},"yogunluk":1.5},{"time":"13/10/2022","vardiya":"V1","slurry":"272","id":5,"nemdata":{},"yogunluk":14},{"time":"12/10/2022","vardiya":"Toplam","slurry":483,"id":6,"nemdata":{},"yogunluk":null},{"time":"12/10/2022","vardiya":"V3","slurry":"142","id":7,"nemdata":{},"yogunluk":null},{"time":"12/10/2022","vardiya":"V2","slurry":"144","id":8,"nemdata":{},"yogunluk":null},{"time":"12/10/2022","vardiya":"V1","slurry":"197","id":9,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"Toplam","slurry":897,"id":10,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"V3","slurry":"279","id":11,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"V2","slurry":"235","id":12,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"V1","slurry":"383","id":13,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"Toplam","slurry":1433,"id":14,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"V3","slurry":"271","id":15,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"V2","slurry":"547","id":16,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"V1","slurry":"615","id":17,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"Toplam","slurry":346,"id":18,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"V3","slurry":"157","id":19,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"V2","slurry":"64","id":20,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"V1","slurry":"125","id":21,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"Toplam","slurry":1108,"id":22,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"V3","slurry":"382","id":23,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"V2","slurry":"386","id":24,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"V1","slurry":"340","id":25,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"Toplam","slurry":904,"id":26,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"V3","slurry":"296","id":27,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"V2","slurry":"347","id":28,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"V1","slurry":"261","id":29,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"Toplam","slurry":715,"id":30,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"V3","slurry":"296","id":31,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"V2","slurry":"257","id":32,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"V1","slurry":"162","id":33,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"Toplam","slurry":915,"id":34,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"V3","slurry":"282","id":35,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"V2","slurry":"182","id":36,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"V1","slurry":"451","id":37,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"Toplam","slurry":1061,"id":38,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"V3","slurry":"243","id":39,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"V2","slurry":"461","id":40,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"V1","slurry":"357","id":41,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"Toplam","slurry":1142,"id":42,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"V3","slurry":"398","id":43,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"V2","slurry":"374","id":44,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"V1","slurry":"370","id":45,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"Toplam","slurry":195,"id":46,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"V3","slurry":"169","id":47,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"V2","slurry":"0","id":48,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"V1","slurry":"26","id":49,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"Toplam","slurry":1160,"id":50,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"V3","slurry":"304","id":51,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"V2","slurry":"443","id":52,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"V1","slurry":"413","id":53,"nemdata":{},"yogunluk":null}]
diff --git a/server/server.js b/server/server.js
@@ -67,25 +67,25 @@ const users = [
         id: 1,
         username: "sedatcapar",
         password: "ss1q2w",
-        roles:['pdc', 'yks', 'slurry', 'ambar']
+        roles:['pdc', 'yks', 'slurry', 'kmadde', 'ambar']
     },
     {
         id: 2,
         username: "tunahansimsek",
         password: "Ts159753",
-        roles:['pdc', 'yks', 'slurry', 'ambar']
+        roles:['pdc', 'yks', 'slurry', 'kmadde', 'ambar']
     },
     {
         id: 3,
         username: "irfansariyar",
         password: "is1425",
-        roles:['pdc', 'slurry', 'ambar']
+        roles:['pdc', 'slurry', 'kmadde', 'ambar']
     },
     {
         id: 4,
         username: "tansukoralay",
         password: "ts1q2w",
-        roles:['pdc', 'slurry', 'ambar']
+        roles:['pdc', 'slurry', 'kmadde', 'ambar']
     },
     {
         id: 5,
@@ -95,9 +95,9 @@ const users = [
     },
     {
         id: 6,
-        username: "lavvarkantar",
-        password: "1925",
-        roles:['pdc', 'slurry', 'ambar']
+        username: "laboratuvar",
+        password: "7452",
+        roles:['pdc', 'slurry', 'kmadde']
     },
 ]
 
@@ -146,7 +146,7 @@ app.get('/api/getlabdata', function (req, res) {
 
 app.post('/api/labdatasavenem', function (req, res) {
     var data = req.body;
-
+    
     fs.readFile(`./laboratuvar/data.json`, null, function (error, r) {
         if (error) {console.log(error);res.send('error');return}
         let d = JSON.parse(r);
@@ -292,8 +292,8 @@ app.get("/takeX", (req, res) => {
     prof.then(function (jsondata) {
         if (jsondata == undefined) { jsondata = 0; }
         var json = fs.readFileSync('./data.json');
-        var labdata = fs.readFileSync('./laboratuvar/data.json');
         var Obj = JSON.parse(json);
+        var labdata = fs.readFileSync('./laboratuvar/data.json');
         var labjson = JSON.parse(labdata);
         var ss = moment().format('H');
         let vard
@@ -392,6 +392,24 @@ app.get("/takeX", (req, res) => {
                         kWh,
                         kWhvard,
                     });
+
+                    var labdata = fs.readFileSync('./laboratuvar/data.json');
+                    var labjson = JSON.parse(labdata);
+                    labjson.unshift({
+                        id: Date.now(),
+                        slurry: Slurry,
+                        time: GetDate(),
+                        vardiya: vard,
+                        nemdata: {},
+                        yogunluk: null,
+                    });
+                    var newLabData = JSON.stringify(labjson);
+                    fs.writeFile('./laboratuvar/data.json', newLabData, err => {
+                        if (err) throw err;
+                        console.log(`${vard} Lab total saved!`);
+                    });
+
+
                     fs.writeFile('./data.json', JSON.stringify(jdata), err => {
                         if (err) throw err;
                         console.log(`${GetDate(false)} Total saved!`);
@@ -509,7 +527,7 @@ ambarPLC.initiateConnection({
 function ambarPLCconnected(err) {
     if (typeof (err) !== "undefined") {
         console.log(err);
- 
+
     }
     ambarPLC.setTranslationCB(function (tag) {
         return ambarPLCvariables[tag];
@@ -647,5 +665,5 @@ function crusherPLCvaluesReady(err, values) {
         bc1b_1: parseInt(values.bc1bpdc1.toFixed()),
         bc1b_2: parseInt(values.bc1bpdc2.toFixed()),
     }
- 
+
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"id":1,"slurry":"272","time":"13/10/2022","vardiya":"V1","nemdata":{"id":1,"bos1":100,"bos2":100,"numune1":100,"numune2":100,"sontart1":190,"sontart2":191,"hesaplanannem1":"10.00","hesaplanannem2":"9.00","ortnem":"9.50","fark":"1.00"},"yogunluk":2},{"id":2,"slurry":"142","time":"12/10/2022","vardiya":"V3","nemdata":{"id":2,"bos1":2,"bos2":2,"numune1":2,"numune2":2,"sontart1":2,"sontart2":2,"hesaplanannem1":"100.00","hesaplanannem2":"100.00","ortnem":"100.00","fark":"0.00"}},{"id":3,"slurry":"0","time":"12/10/2022","vardiya":"V3","nemdata":{}},{"id":4,"slurry":"0","time":"12/10/2022","vardiya":"V3","nemdata":{}}]
		[{"time":"14/10/2022","vardiya":"V1","slurry":"425","id":1,"nemdata":{"id":1,"bos1":100,"bos2":100,"numune1":100,"numune2":100,"sontart1":110,"sontart2":110,"hesaplanannem1":"90.00","hesaplanannem2":"90.00","ortnem":"90.00","fark":"0.00","saved":true},"yogunluk":1.1},{"time":"13/10/2022","vardiya":"Toplam","slurry":559,"id":2,"nemdata":{},"yogunluk":null},{"time":"13/10/2022","vardiya":"V3","slurry":"164","id":3,"nemdata":{"id":3,"bos1":50,"bos2":50,"numune1":50,"numune2":50,"sontart1":50,"sontart2":49.5,"hesaplanannem1":"100.00","hesaplanannem2":"101.00","ortnem":"100.50","fark":"1.00","saved":true},"yogunluk":null},{"time":"13/10/2022","vardiya":"V2","slurry":"123","id":4,"nemdata":{"id":4,"bos1":70,"bos2":70,"numune1":70,"numune2":70,"sontart1":90,"sontart2":89.5,"hesaplanannem1":"71.43","hesaplanannem2":"72.14","ortnem":"71.78","fark":"0.71","saved":true},"yogunluk":1.5},{"time":"13/10/2022","vardiya":"V1","slurry":"272","id":5,"nemdata":{},"yogunluk":14},{"time":"12/10/2022","vardiya":"Toplam","slurry":483,"id":6,"nemdata":{},"yogunluk":null},{"time":"12/10/2022","vardiya":"V3","slurry":"142","id":7,"nemdata":{},"yogunluk":null},{"time":"12/10/2022","vardiya":"V2","slurry":"144","id":8,"nemdata":{},"yogunluk":null},{"time":"12/10/2022","vardiya":"V1","slurry":"197","id":9,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"Toplam","slurry":897,"id":10,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"V3","slurry":"279","id":11,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"V2","slurry":"235","id":12,"nemdata":{},"yogunluk":null},{"time":"11/10/2022","vardiya":"V1","slurry":"383","id":13,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"Toplam","slurry":1433,"id":14,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"V3","slurry":"271","id":15,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"V2","slurry":"547","id":16,"nemdata":{},"yogunluk":null},{"time":"10/10/2022","vardiya":"V1","slurry":"615","id":17,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"Toplam","slurry":346,"id":18,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"V3","slurry":"157","id":19,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"V2","slurry":"64","id":20,"nemdata":{},"yogunluk":null},{"time":"9/10/2022","vardiya":"V1","slurry":"125","id":21,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"Toplam","slurry":1108,"id":22,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"V3","slurry":"382","id":23,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"V2","slurry":"386","id":24,"nemdata":{},"yogunluk":null},{"time":"8/10/2022","vardiya":"V1","slurry":"340","id":25,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"Toplam","slurry":904,"id":26,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"V3","slurry":"296","id":27,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"V2","slurry":"347","id":28,"nemdata":{},"yogunluk":null},{"time":"7/10/2022","vardiya":"V1","slurry":"261","id":29,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"Toplam","slurry":715,"id":30,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"V3","slurry":"296","id":31,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"V2","slurry":"257","id":32,"nemdata":{},"yogunluk":null},{"time":"6/10/2022","vardiya":"V1","slurry":"162","id":33,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"Toplam","slurry":915,"id":34,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"V3","slurry":"282","id":35,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"V2","slurry":"182","id":36,"nemdata":{},"yogunluk":null},{"time":"5/10/2022","vardiya":"V1","slurry":"451","id":37,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"Toplam","slurry":1061,"id":38,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"V3","slurry":"243","id":39,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"V2","slurry":"461","id":40,"nemdata":{},"yogunluk":null},{"time":"4/10/2022","vardiya":"V1","slurry":"357","id":41,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"Toplam","slurry":1142,"id":42,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"V3","slurry":"398","id":43,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"V2","slurry":"374","id":44,"nemdata":{},"yogunluk":null},{"time":"3/10/2022","vardiya":"V1","slurry":"370","id":45,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"Toplam","slurry":195,"id":46,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"V3","slurry":"169","id":47,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"V2","slurry":"0","id":48,"nemdata":{},"yogunluk":null},{"time":"2/10/2022","vardiya":"V1","slurry":"26","id":49,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"Toplam","slurry":1160,"id":50,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"V3","slurry":"304","id":51,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"V2","slurry":"443","id":52,"nemdata":{},"yogunluk":null},{"time":"1/10/2022","vardiya":"V1","slurry":"413","id":53,"nemdata":{},"yogunluk":null}]