Merge pull request 'staging' (#151) from staging into master

Reviewed-on: ordo/adw-backend#151

app/Http/Controllers/ActivityController.php

@@ -47,6 +47,10 @@ class ActivityController extends Controller
 			$dataHeader->progress = $dataHeader->persentase_progress / 100;
 			$dataHeader->planned_start = isset($dataHeader->planned_start) ? date_format(date_create($dataHeader->planned_start), "Y-m-d H:i:s") : NULL;
 			$dataHeader->planned_end = isset($dataHeader->planned_end) ? date_format(date_create($dataHeader->planned_end), "Y-m-d H:i:s") : NULL;
+ 
+			$dataHeader->actual_start = isset($dataHeader->actual_start) ? date_format(date_create($dataHeader->actual_start), "Y-m-d") : NULL;
+			$dataHeader->actual_end = isset($dataHeader->actual_end) ? date_format(date_create($dataHeader->actual_end), "Y-m-d") : NULL;
+
 			$dataHeader->type = "header";
 			$dataHeader->text = $dataHeader->name;
 			$finalData[] = $dataHeader;
@@ -72,6 +76,10 @@ class ActivityController extends Controller
 			$objRow->end_date = date_format($endDate, "Y-m-d H:i:s");
 			$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start), "Y-m-d H:i:s") : NULL;
 			$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end), "Y-m-d H:i:s") : NULL;
+
+			$objRow->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "Y-m-d") : NULL;
+			$objRow->actual_end = isset($objRow->actual_end) ? date_format(date_create($objRow->actual_end), "Y-m-d") : NULL;
+
 			$objRow->progress = $objRow->persentase_progress / 100;
 			$objRow->type = $type;
 			$finalData[] = $objRow;
@@ -115,6 +123,10 @@ class ActivityController extends Controller
 			$objRow->end_date = date_format($endDate, "Y-m-d H:i:s");
 			$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start), "Y-m-d H:i:s") : NULL;
 			$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end), "Y-m-d H:i:s") : NULL;
+			
+			$objRow->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "Y-m-d") : NULL;
+			$objRow->actual_end = isset($objRow->actual_end) ? date_format(date_create($objRow->actual_end), "Y-m-d") : NULL;
+			
 			$dataChildren = $this->getChildren($gantt_id, $objRow->id);
 			if ($objRow->type_activity == "milestone") {
 				$objRow->type = $objRow->type_activity;

app/Http/Controllers/HumanResourceController.php

@@ -139,10 +139,25 @@ class HumanResourceController extends Controller
         }
 
         if ($search && !empty($search)) {
-            $data = UserToProyek::select("m_users.id as id", "m_users.name as name", "assign_hr_to_proyek.project_role as proyek_role")->join('m_users', 'm_users.id', '=', 'assign_hr_to_proyek.user_id')
-            ->where("assign_hr_to_proyek.proyek_id", $idProyek)->where("m_users.name", 'like', '%'.$search.'%')->whereNotIn("m_users.id", $forbidden)->get();
+            $data = UserToProyek::select("m_users.id as id", "m_users.name as name", "assign_hr_to_proyek.project_role as proyek_role")
+                ->join('m_users', 'm_users.id', '=', 'assign_hr_to_proyek.user_id')
+                ->where("assign_hr_to_proyek.proyek_id", $idProyek)
+                ->where(function ($query) {
+                    $query->where("assign_hr_to_proyek.is_customer", "!=", true)
+                        ->orWhereNull("assign_hr_to_proyek.is_customer");
+                })
+                ->where("m_users.name", 'like', '%' . $search . '%')
+                ->whereNotIn("m_users.id", $forbidden)->get();
         } else {
-            $data = UserToProyek::select("m_users.id as id", "m_users.name as name", "assign_hr_to_proyek.project_role as proyek_role")->where("assign_hr_to_proyek.proyek_id", $idProyek)->join('m_users', 'm_users.id', '=', 'assign_hr_to_proyek.user_id')->whereNotIn("m_users.id", $forbidden)->get();
+            $data = UserToProyek::select("m_users.id as id", "m_users.name as name", "assign_hr_to_proyek.project_role as proyek_role")
+                ->where("assign_hr_to_proyek.proyek_id", $idProyek)
+                ->where(function ($query) {
+                    $query->where("assign_hr_to_proyek.is_customer", "!=", true)
+                        ->orWhereNull("assign_hr_to_proyek.is_customer");
+                })
+                ->join('m_users', 'm_users.id', '=', 'assign_hr_to_proyek.user_id')
+                ->whereNotIn("m_users.id", $forbidden)
+                ->get();
         }
 
         return response()->json($data);

app/Http/Controllers/MapMonitoringController.php

@@ -38,10 +38,14 @@ class MapMonitoringController extends Controller
                     'tcio.clock_in_loc',
                     'tcio.clock_out_loc',
                     'tcio.date_presence',
+                    'mw.lat',
+                    'mw.lon',
+                    'mw.wptime'
                 )
                 ->join('m_users as mu', 'mu.id', '=', 'tcio.user_id')
+                ->join('m_waypoint as mw', 'mu.id', '=', 'mw.user_id')
                 ->where('mu.id', $key->user_id)
-                ->orderBy('tcio.id', 'DESC')
+                ->orderBy('mw.wptime', 'DESC')
                 ->first();
             $project = DB::table('assign_hr_to_proyek as ahtp')
                 ->select('ahtp.proyek_id as id', 'mp.nama as project_name')
@@ -53,6 +57,9 @@ class MapMonitoringController extends Controller
                 $image = DB::table('m_image')->select('image')->where('category', 'presensi')->where('ref_id', $presensi->clock_in_out_id)->first();
                 $tmp[] = array(
                     'user_id' => $presensi->user_id,
+                    'wp_lat' => $presensi->lat,
+                    'wp_lon' => $presensi->lon,
+                    'wp_time' => $presensi->wptime,
                     'clock_in' => $presensi->clock_in,
                     'clock_out' => $presensi->clock_out,
                     'clock_in_lat' => $presensi->clock_in_lat,

app/Http/Controllers/PresenceController.php

@@ -266,6 +266,20 @@ class PresenceController extends Controller
                     if($valGeom->type == "FeatureCollection"){ 
                         $multiArea = $valGeom->features;
                         foreach($multiArea as $area){
+                            if ($area->geometry->type === "Point") {
+                                $pointCoordinates = $area->geometry->coordinates;
+                                $pointLng = $pointCoordinates[0];
+                                $pointLat = $pointCoordinates[1];
+
+                                $check = DB::select(DB::raw("SELECT ST_Distance(
+                                    ST_GeomFromGeoJSON('" . json_encode($area->geometry) . "'),
+                                    ST_GeomFromText('POINT(" . $params->clock_in_out['clock_in_lng'] . " " . $params->clock_in_out['clock_in_lat'] . ")', 4326)
+                                ) <= " . $area->properties->radius . " as within_radius"));
+
+                                if ($check[0]->within_radius) {
+                                    break;
+                                }
+                            }
                             $check = DB::select(DB::raw("SELECT ST_Intersects(ST_GeomFromGeoJSON('".json_encode($area->geometry)."'),
                             ST_GeomFromText('POINT(".$params->clock_in_out['clock_out_lng']." ".$params->clock_in_out['clock_out_lat'].")', 4326)) as boundary"));
                             if($check[0]->boundary){
@@ -280,6 +294,20 @@ class PresenceController extends Controller
                     if($valGeom->type == "FeatureCollection"){ 
                         $multiArea = $valGeom->features;
                         foreach($multiArea as $area){
+                            if ($area->geometry->type === "Point") {
+                                $pointCoordinates = $area->geometry->coordinates;
+                                $pointLng = $pointCoordinates[0];
+                                $pointLat = $pointCoordinates[1];
+
+                                $check = DB::select(DB::raw("SELECT ST_Distance(
+                                    ST_GeomFromGeoJSON('" . json_encode($area->geometry) . "'),
+                                    ST_GeomFromText('POINT(" . $params->clock_in_out['clock_in_lng'] . " " . $params->clock_in_out['clock_in_lat'] . ")', 4326)
+                                ) <= " . $area->properties->radius . " as within_radius"));
+
+                                if ($check[0]->within_radius) {
+                                    break;
+                                }
+                            }
                             $check = DB::select(DB::raw("SELECT ST_Intersects(ST_GeomFromGeoJSON('".json_encode($area->geometry)."'), 
                                         ST_GeomFromText('POINT(".$params->clock_in_out['clock_in_lng']." ".$params->clock_in_out['clock_in_lat'].")', 4326)) as boundary"));
                             if($check[0]->boundary){
@@ -292,12 +320,18 @@ class PresenceController extends Controller
                     }
                 }
                 if(count($check)>0){
-                    if($check[0]->boundary){
+                    if(isset($check[0]->boundary) && $check[0]->boundary){
                         $temp[]=array(
                             "activity_id"   => $dataGeom->id,
                             "boundary"      => $check[0]->boundary,
                             "status_assign" => true
                         );
+                    } else if (isset($check[0]->within_radius) && $check[0]->within_radius) {
+                        $temp[]=array(
+                            "activity_id"   => $dataGeom->id,
+                            "boundary"      => $check[0]->within_radius,
+                            "status_assign" => true
+                        );
                     }
                 }
             }

app/Http/Controllers/ProjectController.php

@@ -393,9 +393,12 @@ class ProjectController extends Controller
 			} 
 			if($reports[$i]['status'] != 'done'){
 				$reports[$i]['max_date']->modify('-1 day');
+			}else if($reports[$i]['status'] == 'done'){
+				$activity->actual_end = $reports[$i]['max_date']->setTime(23,59,59);
 			}
-			$activity->start_date = $reports[$i]['min_date'];
-			$activity->end_date = $reports[$i]['max_date']->setTime(23,59,59);
+			$activity->start_date = $reports[$i]['min_date'];  					//same early
+			$activity->end_date = $reports[$i]['max_date']->setTime(23,59,59); 	// same early
+			$activity->actual_start = $reports[$i]['min_date'];
 			$activity->save();
 		}
 

app/Models/Activity.php

@@ -25,7 +25,7 @@ class Activity extends Model
         'buffer_radius', 'duration', 'color_progress', 'jumlah_pekerjaan', 'satuan',
         'description', 'priority', 'bobot_planning', 'type_activity', 'open', 'geom',
         'version_gantt_id', 'budget_plan', 'biaya_material_plan', 'biaya_human_plan', 'biaya_tools_plan',
-        'planned_start', 'planned_end', 'satuan_id',
+        'planned_start', 'planned_end', 'satuan_id', 'actual_start', 'actual_end',
         'created_at', 'created_by', 'updated_at', 'updated_by', 'sortorder'
     ];