Browse Source

Merge branch 'master' of https://git.oslog.id/ordo/adw-backend

pull/3/head
Wahyu Ramadhan 2 years ago
parent
commit
e175b5d69f
  1. 4
      app/Http/Controllers/DivisiController.php
  2. 3
      app/Http/Controllers/PresenceController.php
  3. 20
      rest-client.http

4
app/Http/Controllers/DivisiController.php

@ -20,8 +20,8 @@ class DivisiController extends Controller
public function add(Request $request){
$this->validate($request, [
'name' => 'required',
'description' => 'string',
'parent' => 'integer'
'description' => 'string'
// 'parent' => 'integer'
]);
$data = $request->all();

3
app/Http/Controllers/PresenceController.php

@ -28,7 +28,7 @@ class PresenceController extends Controller
}
if($request->type=="out"){
// $clock_out_loc get data from api.nominatim url serach address payload (lat lot);
$clock_out_loc = "-";
$dataUpdate = array(
"clock_out"=>$request->clock_time,
@ -69,6 +69,7 @@ class PresenceController extends Controller
$onlyDate = date_format($date,"Y-m-d");
// $clock_in_loc get data from api.nominatim url serach address payload (lat lot);
$clock_in_loc = "-";
$dataAdd = array(

20
rest-client.http

@ -814,8 +814,26 @@ content-type: application/json
######
# POST {{hostname}}/
GET {{hostname}}/assign-material/datatablesForReportActivity?draw=2&columns[0][data]=material_name&columns[0][name]=material_name&columns[0][searchable]=true&columns[0][orderable]=true&columns[0][search][value]=&columns[0][search][regex]=false&columns[1][data]=type&columns[1][name]=type&columns[1][searchable]=true&columns[1][orderable]=true&columns[1][search][value]=&columns[1][search][regex]=false&columns[2][data]=qty_planning&columns[2][name]=&columns[2][searchable]=true&columns[2][orderable]=true&columns[2][search][value]=&columns[2][search][regex]=false&columns[3][data]=qty_sum&columns[3][name]=&columns[3][searchable]=true&columns[3][orderable]=true&columns[3][search][value]=&columns[3][search][regex]=false&columns[4][data]=uom&columns[4][name]=uom&columns[4][searchable]=true&columns[4][orderable]=true&columns[4][search][value]=&columns[4][search][regex]=false&columns[5][data]=action&columns[5][name]=action&columns[5][searchable]=true&columns[5][orderable]=true&columns[5][search][value]=&columns[5][search][regex]=false&order[0][column]=0&order[0][dir]=asc&start=0&length=10&search[value]=&search[regex]=false&idact=2511&_=1675418553660
Authorization: Bearer {{token}}
content-type: application/json
######
GET {{hostname}}/dashboard/get-total-project-per-schedule-health
Authorization: Bearer {{token}}
content-type: application/json
GET {{hostname}}/assign-material/datatablesForReportActivity?draw=2&columns[0][data]=material_name&columns[0][name]=material_name&columns[0][searchable]=true&columns[0][orderable]=true&columns[0][search][value]=&columns[0][search][regex]=false&columns[1][data]=type&columns[1][name]=type&columns[1][searchable]=true&columns[1][orderable]=true&columns[1][search][value]=&columns[1][search][regex]=false&columns[2][data]=qty_planning&columns[2][name]=&columns[2][searchable]=true&columns[2][orderable]=true&columns[2][search][value]=&columns[2][search][regex]=false&columns[3][data]=qty_sum&columns[3][name]=&columns[3][searchable]=true&columns[3][orderable]=true&columns[3][search][value]=&columns[3][search][regex]=false&columns[4][data]=uom&columns[4][name]=uom&columns[4][searchable]=true&columns[4][orderable]=true&columns[4][search][value]=&columns[4][search][regex]=false&columns[5][data]=action&columns[5][name]=action&columns[5][searchable]=true&columns[5][orderable]=true&columns[5][search][value]=&columns[5][search][regex]=false&order[0][column]=0&order[0][dir]=asc&start=0&length=10&search[value]=&search[regex]=false&idact=2511&_=1675418553660
######
GET {{hostname}}/dashboard/get-detail-expenditure
Authorization: Bearer {{token}}
content-type: application/json
######
GET {{hostname}}/presence/bulk-update-location
Authorization: Bearer {{token}}
content-type: application/json
#####
GET https://nominatim.oslogdev.com/reverse?lat=-6.2622811&lon=106.7881746&format=json
Loading…
Cancel
Save