From c8aaed9a7b423b6988ca4ccd3ddf45c4e0804db2 Mon Sep 17 00:00:00 2001
From: Muhammad Izza Alfiansyah <iansyah724@gmail.com>
Date: Tue, 9 Jul 2024 16:00:14 +0700
Subject: [PATCH] save all history

---
 microcontroller/sketch_apr22a/sketch_apr22a.ino | 17 +++++++++--------
 website/src/App.tsx                             |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/microcontroller/sketch_apr22a/sketch_apr22a.ino b/microcontroller/sketch_apr22a/sketch_apr22a.ino
index 4a24182..0b1408f 100644
--- a/microcontroller/sketch_apr22a/sketch_apr22a.ino
+++ b/microcontroller/sketch_apr22a/sketch_apr22a.ino
@@ -368,8 +368,6 @@ void runFermentasi() {
   if (isnan(kelembaban)) {
     kelembaban = 0;
   }
-
-  Serial.println("tick : " + String(tickDiffSecond));
   
   if (tickDiffSecond == 1) {
     // menampilkan kadar gas pada LCD
@@ -472,13 +470,13 @@ void runFermentasi() {
 
       getDebugging();
 
-      String dataHistoriJson = db.from("histori_fermentasi").select("*").order("created_at", "desc", true).limit(1).doSelect();
-      JSONVar dataHistori = JSON.parse(dataHistoriJson);
-      bool statusHistoriTerakhir = dataHistori[0]["selesai"];
-      int waktuAkhirHistori = dataHistori[0]["waktu_akhir"];
-      int waktuAwal = dataPengujianAwal["created_time"];
-
       if (dataPengujian.length() > 0) {
+        String dataHistoriJson = db.from("histori_fermentasi").select("*").order("created_at", "desc", true).limit(1).doSelect();
+        JSONVar dataHistori = JSON.parse(dataHistoriJson);
+        
+        int waktuAkhirHistori = dataHistori[0]["waktu_akhir"];
+        int waktuAwal = dataPengujianAwal["created_time"];
+
         if (waktuAwal <= waktuAkhirHistori) {
           bool historiTerakhirBerhasil = (bool) dataHistori[0]["berhasil"];
 
@@ -488,8 +486,11 @@ void runFermentasi() {
             status = "Gagal";
           }
         } else {
+          status = "Menunggu";
           cekKematangan();
         }
+
+        Serial.println("Status : " + status);
       }
 
       insertKondisiTapai();
diff --git a/website/src/App.tsx b/website/src/App.tsx
index 0b96a80..cd4e595 100644
--- a/website/src/App.tsx
+++ b/website/src/App.tsx
@@ -254,19 +254,19 @@ export default function (props: JSX.HTMLAttributes<HTMLDivElement>) {
                   gas selama fermentasi.
                 </li>
               </ul>
-              Simpan hasil fermentasi ke histori?
+              Hasil fermentasi akan di simpan ke histori.
               <div class="mt-8 flex space-x-3 justify-end">
-                <button
+                {/* <button
                   class="bg-gray-400 text-white px-5 py-2 uppercase rounded"
                   onClick={noSaveHistori}
                 >
                   Tutup
-                </button>
+                </button> */}
                 <button
                   class="bg-blue-500 text-white px-5 py-2 uppercase rounded"
                   onClick={saveHistori}
                 >
-                  Simpan
+                  OK
                 </button>
               </div>
             </div>