Merge pull request 'Dev-Farhan' (#53) from Dev-Farhan into staging

Reviewed-on: ibnu/generic-ospro-backend#53

app/Http/Controllers/DivisiController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Models\Divisi;
+use Illuminate\Support\Facades\Log;
 
 class DivisiController extends Controller
 {
@@ -83,7 +84,11 @@ class DivisiController extends Controller
 
 	public function search(Request $request)
 	{
-		$parentDivisi = Divisi::whereNull('parent')->with('children')->get();
+		$companyId = $request->input('columns.0.value');
+		$parentDivisi = Divisi::whereNull('parent')
+			->where('company_id', $companyId)
+			->with('children')
+			->get();
 		$divisions = [];
 		foreach ($parentDivisi as $objRow) {
 			$objRow->children = $this->getAllChildren($objRow);
@@ -95,16 +100,6 @@ class DivisiController extends Controller
 			return response()->json(['status' => 'failed', 'message' => 'Data not found!', 'code' => 404], 404);
 
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $divisions, 'totalRecord' => $countData], 200);
-
-		// $payload = $request->all();
-		// $dataBuilder = $this->setUpPayload($payload, 'm_divisi');
-		// $builder = $dataBuilder['builder'];
-		// $countBuilder = $dataBuilder['count'];
-		// $dataGet = $builder->get();
-		// $totalRecord = $countBuilder->count();
-		// return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
-		//return $this->list();
-		// cant use builder for this case
 	}
 
 	public function list()

app/Http/Controllers/MenuController.php

@@ -30,7 +30,8 @@ class MenuController extends Controller
         }
     }
 
-    public function edit($id){
+    public function edit($id)
+    {
         if (!$id || (int) $id < 0 || $id == "") {
             return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
             die();
@@ -108,7 +109,13 @@ class MenuController extends Controller
 
     public function listMenu($id)
     {
-        $dataParent = RoleMenu::select("m_menu.*")
+        $dataParent = RoleMenu::select(
+            'm_menu.*',
+            "t_roles_menu.create",
+            "t_roles_menu.read",
+            "t_roles_menu.update",
+            "t_roles_menu.delete"
+        )
             ->join('m_menu', 'm_menu.id', '=', 't_roles_menu.menu_id')
             ->join('m_roles', 'm_roles.id', '=', 't_roles_menu.role_id')
             ->whereNull('m_menu.parent_id')
@@ -127,7 +134,13 @@ class MenuController extends Controller
 
     protected function getChildrenMenu($id, $role_id)
     {
-        $dataChildren = RoleMenu::select("m_menu.*")
+        $dataChildren = RoleMenu::select(
+            'm_menu.*',
+            "t_roles_menu.create",
+            "t_roles_menu.read",
+            "t_roles_menu.update",
+            "t_roles_menu.delete"
+        )
             ->join('m_menu', 'm_menu.id', '=', 't_roles_menu.menu_id')
             ->join('m_roles', 'm_roles.id', '=', 't_roles_menu.role_id')
             ->where('m_roles.id', $role_id)
@@ -136,8 +149,7 @@ class MenuController extends Controller
             ->get();
         $children = [];
         if ($dataChildren) {
-            foreach($dataChildren as $data)
-            {
+            foreach ($dataChildren as $data) {
                 $data->children = $this->getChildrenMenu($data->id, $role_id);
                 $children[] = $data;
             }

app/Http/Controllers/UserToActivityController.php

@@ -11,7 +11,8 @@ use Datatables;
 
 class UserToActivityController extends Controller
 {
-	public function add(Request $request){
+	public function add(Request $request)
+	{
 		$this->validate($request, [
 			'activity_id'        => 'required',
 			'user_id'           => 'required'
@@ -26,7 +27,8 @@ class UserToActivityController extends Controller
 		return response()->json(['status' => 'success', 'message' => 'Data added!', 'code' => 200]);
 	}
 
-	public function addMultiple(Request $request){
+	public function addMultiple(Request $request)
+	{
 		$users_id = $request->user_id;
 		$users_role = $request->role_proyek_id;
 
@@ -75,10 +77,10 @@ class UserToActivityController extends Controller
 		} else {
 			return response()->json(['status' => 'success', 'message' => 'Data added!', 'code' => 200]);
 		}
-
 	}
 
-	private function updatedCostPlanning($parent_id) {
+	private function updatedCostPlanning($parent_id)
+	{
 		$sumBiaya = Activity::selectRaw('sum(cast(rencana_biaya as double precision))')
 			->where("parent_id", $parent_id)
 			->first();
@@ -89,7 +91,8 @@ class UserToActivityController extends Controller
 		}
 	}
 
-	public function update(Request $request, $id){
+	public function update(Request $request, $id)
+	{
 		if (empty($id) || !is_int((int)$id))
 			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
@@ -116,7 +119,8 @@ class UserToActivityController extends Controller
 		return response()->json(['status' => 'failed', 'message' => 'Failed to delete!', 'code' => 500], 500);
 	}
 
-	public function edit($id){
+	public function edit($id)
+	{
 		if (!$id || (int) $id < 0 || $id == "") {
 			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 			die();
@@ -136,12 +140,19 @@ class UserToActivityController extends Controller
 		$builder = $dataBuilder['builder'];
 		$countBuilder = $dataBuilder['count'];
 		$builder->addSelect(DB::raw('SUM(report_activity_material.qty) as volume_actual'));
-        $builder->groupBy("m_activity.id");
+		$builder->groupBy("m_activity.name");
+		$builder->groupBy("m_activity.persentase_progress");
+		$builder->groupBy("m_activity.actual_start");
+		$builder->groupBy("m_activity.actual_end");
+		$builder->groupBy("m_activity.planned_start");
+		$builder->groupBy("m_activity.planned_end");
+		$builder->groupBy("m_activity.start_date");
+		$builder->groupBy("m_activity.end_date");
+		$builder->groupBy("m_activity.duration");
 		$builder->groupBy("selfTable.id");
 		$builder->groupBy("selfTable.start_date");
 		$builder->groupBy("selfTable.end_date");
-        $builder->groupBy("m_users.name");
-        $builder->groupBy("assign_material_to_activity.id");
+		$builder->groupBy("assign_material_to_activity.qty_planning");
 		$builder->groupBy("m_version_gantt.name_version");
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
@@ -191,11 +202,22 @@ class UserToActivityController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => count($dataGet)], 200);
 	}
 
-	public function activityUser(Request $request){
+	public function activityUser(Request $request)
+	{
 		$payload = $request->all();
 		$activity = DB::table('m_activity as ma')
-				->select('ahta.id', 'ma.id as activity_id', 'ma.proyek_id', 'ma.name as join_second_name', 'ma.start_date as join_second_start_date', 
-				'ma.end_date as join_second_end_date', 'ma.persentase_progress', 'mvg.name_version', 'mp.nama as nama_proyek', 'mp.type_proyek_id')
+			->select(
+				'ahta.id',
+				'ma.id as activity_id',
+				'ma.proyek_id',
+				'ma.name as join_second_name',
+				'ma.start_date as join_second_start_date',
+				'ma.end_date as join_second_end_date',
+				'ma.persentase_progress',
+				'mvg.name_version',
+				'mp.nama as nama_proyek',
+				'mp.type_proyek_id'
+			)
 			->join('assign_hr_to_activity as ahta', 'ahta.activity_id', '=', 'ma.id')
 			->join('m_version_gantt as mvg', 'mvg.id', '=', 'ma.version_gantt_id')
 			->join('m_proyek as mp', 'mp.id', '=', 'ma.proyek_id')
@@ -262,7 +284,8 @@ class UserToActivityController extends Controller
 		}
 	}
 
-	public function datatables(Request $request){
+	public function datatables(Request $request)
+	{
 		$id_activity = $request->query('idact');
 		$data = UserToActivity::select("assign_hr_to_activity.id as id", "assign_hr_to_activity.start_date", "assign_hr_to_activity.end_date", "u.name as user_name", "mrp.name as role_name")
 			->join("m_role_proyek as mrp", "mrp.id", "=", "assign_hr_to_activity.role_proyek_id")

app/Models/Company.php

@@ -34,6 +34,7 @@ class Company extends Model
         'updated_by',
         'cluster',
         'type_account',
-        'date_register'
+        'date_register',
+        'discount_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', 'create', 'read', 'update', 'delete', 'created_at', 'created_by', 'updated_at', 'updated_by'
     ];
 }

app/Models/User.php

@@ -24,7 +24,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
     protected $fillable = [
         'name', 'email', 'role_id', 'username', 'session_login', 'phone_number', 'email', 'address',
         'fcm_token', 'gender', 'birth_place', 'birth_date', 'blood_type', 'ktp_number', 'working_hours',
-        'created_at', 'created_by', 'updated_at', 'updated_by', 'status_resource'
+        'created_at', 'created_by', 'updated_at', 'updated_by', 'status_resource', 'discount_id'
     ];
 
     const CREATED_AT = 'created_at';
@@ -83,11 +83,9 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
             ->first();
 
         $shift = null;
-        if ($userShift !== null) 
-        {
+        if ($userShift !== null) {
             $shiftId = null;
-            switch ($ts->shortEnglishDayOfWeek) 
-            {
+            switch ($ts->shortEnglishDayOfWeek) {
                 case "Mon":
                     $shiftId = $userShift->mon_shift_id;
                     break;
@@ -123,8 +121,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
         }
 
 
-        if ($shift !== null) 
-        {
+        if ($shift !== null) {
             $from = Carbon::createFromTimeString($shift->start_time, $tz)
                 ->subMinutes($shift->flex_time_minute);
             $to = Carbon::createFromTimeString($shift->end_time, $tz)
@@ -150,16 +147,14 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
     {
 
         $ts = $at;
-        if ($at !== null) 
-        {
+        if ($at !== null) {
             $ts = Carbon::now($tz);
         }
         $tsSec = $ts->secondsSinceMidnight();
 
         $status = "";
         $wt = $this->getWorkingTime($ts, $tz);
-        if ($wt === null) 
-        {
+        if ($wt === null) {
             $status = self::HOLIDAY;
         } else {
             $from = $wt->from;