Merge pull request 'Dev-Farhan' (#216) from Dev-Farhan into general

Reviewed-on: ordo/adw-backend#216

app/Http/Controllers/ActivityController.php

@@ -527,6 +527,17 @@ class ActivityController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
 	}
 
+    public function searchAnalysis(Request $request)
+	{
+		$dataBuilder = $this->setUpPayload($request->all(), 'm_activity');
+		$builder = $dataBuilder['builder'];
+        $dataGet = $builder->select('selfTable.*','m_version_gantt.name_version', 'm_users.name as user_name')
+                        ->join('m_version_gantt', 'm_version_gantt.id', '=', 'selfTable.version_gantt_id')
+                        ->join('assign_hr_to_activity', 'assign_hr_to_activity.activity_id', '=', 'selfTable.id')
+                        ->join('m_users', 'assign_hr_to_activity.user_id', '=', 'm_users.id')
+		                ->get();
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200);
+	}
 	// before upload file
 	public function importOld(Request $request)
 	{

app/Http/Controllers/CompanyController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Company;
+use Illuminate\Http\Request;
+
+class CompanyController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Company  $company
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Company $company)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Company  $company
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Company $company)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Company  $company
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Company $company)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Company  $company
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Company $company)
+    {
+        //
+    }
+}

app/Http/Controllers/Controller.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\Http\Controllers;
+
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use App\Models\UserToActivity;
@@ -16,18 +17,21 @@ class Controller extends BaseController
     protected $pathDocument   = "assets/file/project/";
     protected $pathTmpImport   = "assets/file/tmpimport/";
     protected $pathActivityDocument = "assets/file/activity/";
-    protected $listJoinAll = ['first', 'second', 'third', 'fourth', 'fifth',
-    'sixth', 'seventh', 'eighth', 'ninth', 'tenth'];
+    protected $listJoinAll = [
+        'first', 'second', 'third', 'fourth', 'fifth',
+        'sixth', 'seventh', 'eighth', 'ninth', 'tenth'
+    ];
     protected $currentDate;
     protected $currentName;
     protected $currentId;
+    protected $companyId;
 
     public function __construct()
     {
         $this->currentDate = date("Y-m-d H:i:s");
         $this->currentName = auth()->user() ? auth()->user()->name : "system";
         $this->currentId = auth()->user() ? auth()->user()->id : 0;
-
+        $this->companyId = auth()->user() ? auth()->user()->company_id : 0;
         $this->pathImage = config('assets.image');
         $this->pathDocument = config('assets.project');
         $this->pathActivityDocument = config('assets.activity');
@@ -182,7 +186,8 @@ class Controller extends BaseController
         return $query;
     }
 
-    private function whereConditionSingleTable($oldQuery, $operator, $column, $value, $value2){
+    private function whereConditionSingleTable($oldQuery, $operator, $column, $value, $value2)
+    {
         $query = $oldQuery;
         if ($operator == "range") {
             $query = $query->whereBetween($column, [$value, $value2]);
@@ -223,7 +228,8 @@ class Controller extends BaseController
         return $query;
     }
 
-    protected function calculateAllCost($activity_id, $proyek_id){
+    protected function calculateAllCost($activity_id, $proyek_id)
+    {
         $humanCostPlanning = $this->calculateAllHumanCost($activity_id, $proyek_id);
         $materialCostPlanning = $this->calculateMaterialCost($activity_id, $proyek_id);
         $toolsCostPlanning = 0;
@@ -271,7 +277,8 @@ class Controller extends BaseController
         return $totalCost;
     }
 
-    protected function getLoc($lat, $lng){
+    protected function getLoc($lat, $lng)
+    {
         // $response = Http::get(config('api.nominatim') . "/reverse?lat=".$lat."&lon=".$lng."&format=json");
         // return $response->json;
 
@@ -281,7 +288,8 @@ class Controller extends BaseController
         return $response;
     }
 
-    private function curlRequest($url){
+    private function curlRequest($url)
+    {
         $ch = curl_init();
         // $headers = [
         // 	'Authorization: '.$token
@@ -298,7 +306,8 @@ class Controller extends BaseController
         return json_decode($response);
     }
 
-    protected function addDetailK3($dataDetail, $report_id){
+    protected function addDetailK3($dataDetail, $report_id)
+    {
         foreach ($dataDetail as $value) {
             $dataNew = array(
                 "report_k3_id" => $report_id,

app/Http/Controllers/DashboardBoDController.php

@@ -304,7 +304,7 @@ class DashboardBoDController extends Controller
 	{
 		$year = $this->interpolateYear($year);
 
-		$divisions = Divisi::select('id', 'name')
+		$divisions = Divisi::select('id', 'name', 'color')
 			->with('children')
 			->whereNull('parent')
 			->get();

app/Http/Controllers/ProjectController.php

@@ -229,6 +229,7 @@ class ProjectController extends Controller
 		$dataBuilder = $this->setUpPayload($payload, 'm_proyek');
 		$builder = $dataBuilder['builder'];
 		$countBuilder = $dataBuilder['count'];
+        // $builder->where("selfTable.created_by",$this->currentName);
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
 
@@ -274,7 +275,9 @@ class ProjectController extends Controller
 			'created_by',
 			'updated_at',
 			'updated_by'
-		)->orderBy('id', 'desc')->get();
+        )->orderBy('id', 'desc')
+         // ->where("created_by",$this->currentName)
+         ->get();
 		$countData = $data->count();
 
 		if(!$data)

app/Http/Controllers/UserToActivityController.php

@@ -129,6 +129,16 @@ class UserToActivityController extends Controller
 		return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
 	}
 
+	public function searchAnalysis(Request $request)
+	{
+		$dataBuilder = $this->setUpPayload($request->all(), 'assign_hr_to_activity');
+		$builder = $dataBuilder['builder'];
+		$countBuilder = $dataBuilder['count'];
+		$dataGet = $builder->get();
+		$totalRecord = $countBuilder->count();
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
+	}
+
 	public function search(Request $request)
 	{
 		$payload = $request->all();

app/Models/Company.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Company extends Model
+{
+    protected $table = 'm_divisi';
+
+    const CREATED_AT = 'created_at';
+    const UPDATED_AT = 'updated_at';
+
+    protected $fillable = [
+        "registration_no",
+        "company_name",
+        "address",
+        "phone_no",
+        "email",
+        "description",
+        "logo_login",
+        "logo_header",
+        "favicon_image",
+        "login_instruction",
+        "about",
+        "html_title",
+        "app_name",
+        "base_url",
+        "is_active",
+        "template_id",
+        'created_at',
+        'created_by',
+        'updated_at',
+        'updated_by',
+        'company_id'
+    ];
+}

app/Models/Divisi.php

@@ -19,10 +19,12 @@ class Divisi extends Model
 		'created_at',
 		'created_by',
 		'updated_at',
-        'updated_by'
+		'updated_by',
+		'company_id'
 	];
 
-	public static function boot() {
+	public static function boot()
+	{
 		parent::boot();
 
 		static::deleting(function ($data) {

app/Models/HumanResource.php

@@ -33,6 +33,7 @@ class HumanResource extends Model
         'updated_at',
         'updated_by',
         'divisi_id',
-        'status_boundary'
+        'status_boundary',
+        'company_id'
     ];
 }

app/Models/Menu.php

@@ -13,6 +13,6 @@ class Menu extends Model
 
     protected $fillable = [
         'parent_id', 'icon', 'name', 'alias_name', 'url', 'sequence',
-        'created_at', 'created_by', 'updated_at', 'updated_by'
+        'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/ProjectPhase.php

@@ -12,6 +12,6 @@ class ProjectPhase extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'name', 'color', 'order', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'name', 'color', 'order', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/ProjectRole.php

@@ -12,6 +12,6 @@ class ProjectRole extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/ProjectType.php

@@ -12,6 +12,6 @@ class ProjectType extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/Role.php

@@ -12,6 +12,6 @@ class Role extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'name', 'description', 'default_page', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'name', 'description', 'default_page', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

app/Models/RoleMenu.php

@@ -12,6 +12,6 @@ class RoleMenu extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'role_id', 'menu_id', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'role_id', 'menu_id', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id', "create", "read", "update", "delete"
     ];
 }

app/Models/Satuan.php

@@ -12,6 +12,6 @@ class Satuan extends Model
     const UPDATED_AT = 'updated_at';
 
     protected $fillable = [
-        'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by'
+        'name', 'description', 'created_at', 'created_by', 'updated_at', 'updated_by', 'company_id'
     ];
 }

routes/web.php

@@ -197,6 +197,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->get('/user-to-activity/edit/{id}', 'UserToActivityController@edit');
 		$router->put('/user-to-activity/update/{id}', 'UserToActivityController@update');
 		$router->post('/user-to-activity/search', 'UserToActivityController@search');
+		$router->post('/user-to-activity/search-analysis', 'UserToActivityController@searchAnalysis');
 		$router->post('/user-to-activity/list-filtered', 'UserToActivityController@listFiltered');
 		$router->delete('/user-to-activity/delete/{id}', 'UserToActivityController@delete');
 		$router->get('/user-to-activity/list', 'UserToActivityController@list');
@@ -204,7 +205,8 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 
 		$router->get('/sumVolActualM/{id}', 'ActivityController@sumVolumeActualMaterial');
 		$router->get('/activity/{id}/{proyek_id}/get', 'ActivityController@getByGanttId');
-		$router->get('/activity/search', 'ActivityController@search');
+		$router->post('/activity/search', 'ActivityController@search');
+		$router->post('/activity/search-analysis', 'ActivityController@searchAnalysis');
     	$router->post('/activity/import', 'ActivityController@import');
     	$router->post('/activity/import-update', 'ActivityController@importUpdate');
     	$router->post('/activity/import-old', 'ActivityController@importOld');