feat: fixed bug

edit-mode/function/expenseResource.js

@@ -1,10 +1,11 @@
 var expenseModal = $('#modal-expense > .modal-dialog > .modal-content');
 
 function resetFormAssignexpense() {
-    $('#select-expense').val(null).trigger("change");
-    $('#select-expense').find('option').remove();
-    $('#select-expense').val("");
-    $('#uom-req-expense').val(null).trigger('change');
+    // $('#select-expense').val(null).trigger("change");
+    // $('#select-expense').find('option').remove();
+    // $('#select-expense').val("");
+    $("#desc-expense").val("");
+    $('#uom-req-expense').val("").trigger('change');
     $('#form-assign-expense').trigger("reset");
     $('#btn-assign-expense').html('Assign');
     $('#btn-assign-expense').prop("disabled", false);
@@ -88,18 +89,18 @@ $(document).ready(function () {
     });
 
     $('#modal-expense').on('show.bs.modal', function (event) {
-        $("#desc-expense").val(activityName);
+        resetFormAssignexpense();
         $('#modal-expense-title').html("Overhead " + activityName);
         $('#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();
     });
 
     $('#modal-expense').on('hide.bs.modal', function (event) {
+        resetFormAssignexpense();
         $("#show-form-expense").show();
         if (actionHappen) {
             updateActivity(activityId);
         }
-        resetFormAssignexpense();
     });
 
     $('#select-expense').select2({
@@ -160,7 +161,7 @@ $(document).ready(function () {
             type: "expense",
             fom_date: required_date,
             required_date: required_date,
-            proyek_id: proyekId,
+            proyek_id: parseInt(proyekId),
             uom: uom,
             qty: formatReplaceTitikRibuan(qty_planning),
             price: formatReplaceTitikRibuan(price)
@@ -175,7 +176,6 @@ $(document).ready(function () {
                 if (data && data.code === 200) {
                     material_id = data.data.id;
                     resetFormAssignexpense();
-
                     let payloadAssign = {
                         proyek_id: proyekId,
                         activity_id: activityId,
@@ -192,35 +192,34 @@ $(document).ready(function () {
                         contentType: false,
                         success: function (data) {
                             if (data && data.code === 200) {
+                                resetFormAssignexpense();
                                 actionHappen = true;
                                 gantt.alert("Data added!");
                                 tableexpense.draw();
-                                resetFormAssignexpense();
-                            }
-                            else {
-                                gantt.alert({ type: "error", text: data.message });
+                            } else {
                                 $('#btn-assign-expense').html('Assign');
                                 $('#btn-assign-expense').prop("disabled", false);
+                                gantt.alert({ type: "error", text: data.message });
                             }
                         },
                         error: function (data) {
+                            $('#btn-assign-expense').html('Assign');
+                            $('#btn-assign-expense').prop("disabled", false);
                             gantt.alert("Assign Failed, try again later!");
-                            resetFormAssignexpense();
                         }
                     });
-                }
-                else {
-                    gantt.alert({ type: "error", text: data.message });
+                } else {
                     $('#btn-assign-expense').html('Assign');
                     $('#btn-assign-expense').prop("disabled", false);
+                    gantt.alert({ type: "error", text: data.message });
                 }
             },
             error: function (data) {
+                $('#btn-assign-expense').html('Assign');
+                $('#btn-assign-expense').prop("disabled", false);
                 gantt.alert("Overhead request Failed, try again later!");
-                resetFormAssignexpense();
             }
         });
-
     });
 
     // delete from row

edit-mode/function/function.js

@@ -196,6 +196,7 @@ function getSatuan() {
         ]
       }
 	}
+	
 	$.ajax({
 		data: JSON.stringify(payload),
 		url: `${base_url}satuan/search`,
@@ -223,7 +224,7 @@ function getSatuan() {
 				let newOption = new Option(option.label, option.label);
 				$('#uom-req-material').append(newOption);
 			});
-
+			$('#uom-req-expense').append(new Option('', '', true, true));
 			satuanList.forEach((option) => {
 				let newOption = new Option(option.label, option.label);
 				$('#uom-req-expense').append(newOption);

edit-mode/function/ganttConfig.js

@@ -294,14 +294,14 @@ var allColumns = [
 		editor: editor.text,
 		resize: true,
 		template: function (text) {
-			function truncateText(text, maxLength) {
-				if (text.length > maxLength) {
-					return text.substring(0, maxLength) + '...';
-				}
-				return text;
-			}
-			const truncatedText = truncateText(text.text, 30);
-			return `<span title="${text.text}">${truncatedText}</span>`;
+			// function truncateText(text, maxLength) {
+			// 	if (text.length > maxLength) {
+			// 		return text.substring(0, maxLength) + '...';
+			// 	}
+			// 	return text;
+			// }
+			// const truncatedText = truncateText(text.text, 30);
+			return `<span title="${text.text}">${text.text}</span>`;
 		}
 	},
 	{

edit-mode/index.html

@@ -67,7 +67,7 @@
 	<div class="loading-overlay"></div>
 	<div class="container-header">
 		<div class="container-project">
-			<h6 id="project-name-header"></h6>
+			<h6 id="project-name-header" style="margin-left: 10px;"></h6>
 		</div>
 		<div class="container-action">
 			<div class="btn-icon-toolbar btn-sm"><span class="icon-toolbar-separator">Zoom: </span></div>