Merge pull request 'dev-wahyun' (#2) from dev-wahyun into master

Reviewed-on: #2

edit-mode/function/expenseResource.js

@@ -90,7 +90,7 @@ $(document).ready(function () {
     $('#modal-expense').on('show.bs.modal', function (event) {
         $("#desc-expense").val(activityName);
         $('#modal-expense-title').html("Overhead " + activityName);
-        $('#modal-expense-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#modal-expense-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         tableexpense.draw();
     });
 

edit-mode/function/function.js

@@ -191,15 +191,9 @@ function getSatuan() {
 	const payload = {
 		"columns": [],
 	}
-	if (role_name !== "Super Admin") {
-		payload.columns.push(
-			{ "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" },
-		)
-	} else {
-		payload.columns.push(
-			{ "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" },
-		)
-	}
+	payload.columns.push(
+		{ "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" },
+	)
 	$.ajax({
 		data: JSON.stringify(payload),
 		url: `${base_url}satuan/search`,

edit-mode/function/humanResource.js

@@ -79,11 +79,11 @@ $(document).ready(function () {
 
     $('#modal-hr').on('show.bs.modal', function (event) {
         $('#modal-hr-title').html("Human Resource " + activityName);
-        $('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         $("#hr-start-date").val(moment(activityEarlyStart).format('YYYY-MM-DD'));
         $("#hr-end-date").val(moment(activityEarlyFinish).format('YYYY-MM-DD'));
-        $('#modal-hr-time-startDate').html("Minimum from " + moment(activityEarlyStart).format('MM-DD-YYYY'));
-        $('#modal-hr-time-endDate').html("Maximum from " + moment(activityEarlyFinish).format('MM-DD-YYYY'));
+        $('#modal-hr-time-startDate').html("Minimum from " + moment(activityEarlyStart).format('DD MMMM YYYY'));
+        $('#modal-hr-time-endDate').html("Maximum from " + moment(activityEarlyFinish).format('DD MMMM YYYY'));
         tableHr.draw();
     });
 

edit-mode/function/materialResource.js

@@ -90,7 +90,7 @@ $(document).ready(function () {
 
     $('#modal-material').on('show.bs.modal', function (event) {
         $('#modal-material-title').html("Material Resource " + activityName);
-        $('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         tableMaterial.draw();
     });
 

edit-mode/function/reportActivity.js

@@ -288,7 +288,7 @@ $(document).ready(function () {
 
     $('#modal_report_activity').on('show.bs.modal', function (event) {
         $("#report_activity_title").html(`Report Activity ${activityName}`)
-        $('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         tableRa.draw();
     });
 
@@ -582,7 +582,7 @@ $(document).ready(function () {
             materialName = materialName + '"';
         }
         $("#report_activity_material_title").html(`Report Activity Actual ${materialName}`);
-        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         $("#modal_report_activity").hide();
 
         $("#form_report_activity_material").show();
@@ -618,7 +618,7 @@ $(document).ready(function () {
             materialName = materialName + '"';
         }
         $("#report_activity_material_title").html(`Report Activity Plan ${materialName}`);
-        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         $("#modal_report_activity").hide();
         // $("#show_form_ra_material").hide();
         $("#form_report_activity_material").hide();

edit-mode/function/toolsResource.js

@@ -63,7 +63,7 @@ $(document).ready(function () {
 
     $('#modal-tools').on('show.bs.modal', function (event) {
         $('#modal-tools-title').html("Tools Resource " + activityName);
-        $('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         tableTools.draw();
     });
 

view-mode/function/humanResource.js

@@ -44,7 +44,7 @@ $(document).ready(function () {
 
 	$('#modal-hr').on('show.bs.modal', function (event) {
 		$('#modal-hr-title').html("Human Resource " + activityName);
-        $('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#modal-hr-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
 		tableHr.draw();
 	});
 

view-mode/function/materialResource.js

@@ -55,7 +55,7 @@ $(document).ready(function () {
 
 	$('#modal-material').on('show.bs.modal', function (event) {
 		$('#modal-material-title').html("Material Resource " + activityName);
-		$('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+		$('#modal-material-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
 		tableMaterial.draw();
 	});
 

view-mode/function/reportActivity.js

@@ -136,7 +136,7 @@ $(document).ready(function () {
 
     $('#modal_report_activity').on('show.bs.modal', function (event) {
         $("#report_activity_title").html(`Report Activity ${activityName}`)
-        $('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#report_activity_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         tableRa.draw();
     });
 
@@ -188,7 +188,7 @@ $(document).ready(function () {
         materialName = $(this).data('material-name');
 
         $("#report_activity_material_title").html(`Report Activity Actual Material ${materialName}`);
-        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         $("#modal_report_activity").hide();
 
         $("#form_report_activity_material").show();
@@ -209,7 +209,7 @@ $(document).ready(function () {
         assignMaterialId = $(this).data('id');
         materialName = $(this).data('material-name');
         $("#report_activity_material_title").html(`Report Activity Plan Material ${materialName}`);
-        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#report_activity_material_sub_title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         $("#modal_report_activity").hide();
         $("#activity_material_plan").show();
         $("#activity_material_actual").hide();

view-mode/function/toolsResource.js

@@ -57,7 +57,7 @@ $(document).ready(function () {
 
     $('#modal-tools').on('show.bs.modal', function (event) {
         $('#modal-tools-title').html("Tools Resource " + activityName);
-        $('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date ${moment(activityEarlyStart).format('MM-DD-YYYY')} - ${moment(activityEarlyFinish).format('MM-DD-YYYY')}</p>`);
+        $('#modal-tools-sub-title').html(`<p style="font-size: 12px; color: #747474">Plan Date: ${moment(activityEarlyStart).format('DD MMMM YYYY')} - ${moment(activityEarlyFinish).format('DD MMMM YYYY')}</p>`);
         tableTools.draw();
     });