From 95d7c5885c9bb6b581fd4abb909cab646a0e8b4d Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Wed, 1 Mar 2023 14:24:07 +0700
Subject: [PATCH] update conflict

---
 rest-client.http | 50 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/rest-client.http b/rest-client.http
index 6cdd4ad..b708d1d 100644
--- a/rest-client.http
+++ b/rest-client.http
@@ -1,4 +1,4 @@
-@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODQ0NFwvYXBpXC9sb2dpbiIsImlhdCI6MTY3NjI5MTQwNiwiZXhwIjoxNjc2ODk2MjA2LCJuYmYiOjE2NzYyOTE0MDYsImp0aSI6IkNNRVNGMEcwVzVNQlRLenoiLCJzdWIiOjEyNDcsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.ZV2ncAf6H61vnK7fmg-bMfeqBTcxm0aFE5zs_4tor8g
+@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODQ0NFwvYXBpXC9sb2dpbiIsImlhdCI6MTY3NzQ3NzIzMSwiZXhwIjoxNjc4MDgyMDMxLCJuYmYiOjE2Nzc0NzcyMzEsImp0aSI6ImR5WWhRY3ZIbUJEcmFKMG0iLCJzdWIiOjEsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.9zT6CBbQholzIdQ9ZBDoxMvrR-PKvIYkGzdNB6bim0Y
 
 # @hostname = https://adw-api.ospro.id/api
 # @hostname = https://ospro-api.ospro.id/api
@@ -15,8 +15,8 @@ POST {{hostname}}/login
 content-type: application/json
 
 {
-    "username": "demo",
-    "password": "demo123"
+    "username": "admin",
+    "password": "1nt3gr4s14"
 }
 
 ###### Tools Req
@@ -804,7 +804,7 @@ content-type: application/json
 {
     "clock_in_lat": -6.16678379060529, 
     "clock_in_lng": 106.9175039866567,
-    "clock_time": "2023-02-10T14:48:17+07:00", 
+    "clock_time": "2023-02-16T14:48:17+07:00", 
     "type": "in", 
     "user_id": 1247
 }
@@ -869,8 +869,7 @@ Authorization: Bearer {{token}}
 content-type: application/json
 
 {
-	"project_id" : [1, 2, 3]
-	
+	"project_id" : [75, 76, 78]
 }
 
 ######
@@ -972,4 +971,41 @@ content-type: application/json
 #         "length": 25,
 #         "start": 0
 #     }
-# }
\ No newline at end of file
+# }
+
+
+GET /stock_master?name=SEARCH
+
+######
+GET {{hostname}}/request-material/get-material-integration
+Authorization: Bearer {{token}}
+content-type: application/json
+
+
+######
+POST {{hostname}}/presence/reportk3
+Authorization: Bearer {{token}}
+content-type: application/json
+
+{
+    "time" : "2023-02-16T14:48:17+07:00", // untuk report date, time_clockin/out
+    "user_id": 1247,
+    "clock_in_out": {
+        "clock_in_lat": -6.16678379060529, 
+        "clock_in_lng": 106.9175039866567, 
+        "type": "in"
+    },
+    "report_k3": {
+        "proyek_id": "", 
+        "description": "",
+        "detail": [{
+            "checklist_id": 1,
+            "checklist_name": ""
+        },
+        {
+            "checklist_id": 2,
+            "checklist_name": ""
+        }]
+
+    }
+}
\ No newline at end of file