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

Reviewed-on: ordo/adw-gantt#21

edit-mode/function/activityLocation.js

@@ -43,6 +43,9 @@ function updateCurrentGeoJson() {
     let shapes = [];
     drawnItems.eachLayer(function (layer) {
         let geojson = layer.toGeoJSON();
+        if (layer instanceof L.Circle) {
+            geojson.properties.radius = layer.getRadius();
+        }
         shapes.push(geojson);
     });
     currentGeoJson = {
@@ -50,8 +53,7 @@ function updateCurrentGeoJson() {
         features: shapes
     };
 }
-function openActivityMap(id)
+function openActivityMap(id) {
-{
     currentIdAct = id;
     map.invalidateSize();
     $.ajax({
@@ -70,7 +72,15 @@ function openActivityMap(id)
                         let lGeoJson = L.geoJSON(feature);
                         let layers = lGeoJson.getLayers();
                         layers.forEach(layer => {
+                            let radius = layer.feature.properties.radius;
+                            if (radius) {
+                                let latlon = layer.getLatLng();
+                                let circle = L.circle([latlon.lat, latlon.lng], { radius: radius });
+                                addDrawnLayer(circle);
+                            }
+                            else {
                                 addDrawnLayer(layer)
+                            }
                         });
                     });
                 } else {
@@ -234,8 +244,7 @@ $(document).ready(function () {
         });
     }
 
-    function submitLocation()
+    function submitLocation() {
-    {
         let payload
 
         if (currentGeoJson && currentGeoJson != "") {
@@ -279,14 +288,13 @@ $(document).ready(function () {
     });
 });
 
-function submitCircle(radius)
+function submitCircle(radius) {
-{
     let circle = L.circle([circLat, circLong], { radius: radius });
     let geojsoncircle = circle.toGeoJSON();
     geojsoncircle.properties.radius = radius
     currentGeoJson = geojsoncircle
-    // console.log("geojsoncircle", geojsoncircle);
     addDrawnLayer(circle);
+    updateCurrentGeoJson();
     map.addControl(drawnControlEdit);
 
     $("#modal_radius").modal('hide');

edit-mode/function/ganttConfig.js

@@ -285,19 +285,6 @@ var allColumns = [
 			return text.planned_start;
 		}
 	}, 
-	// {
-	// 	name: "early_start", label: "Early Start", align: "center", min_width: 80, editor: editor.early_start, resize: true, template: function (text) { 
-	// 		let siblingId = gantt.getPrevSibling(text.id);
-	// 		if(siblingId){
-	// 			let tempText = gantt.getTask(siblingId);
-	// 			console.log("iddd ", gantt.getTask(siblingId));
-	// 			return moment(tempText.end_date).format('YYYY-MM-DD');
-	// 		} 
-	// 		return text.planned_start;
-	// 	}
-	// }, 
-	{ name: "early_start", label: "Early Start", align: "center", min_width: 80, editor: editor.early_start, resize: true },
-	{ name: "start_date", label: "Actual Start", align: "center", min_width: 80, editor: editor.start_date, resize: true },
 	{
 		name: "planned_end", label: "Baseline Finish", align: "center", min_width: 80, editor: editor.planned_end, resize: true, template: function (text) {
 			if (!text.planned_end) {
@@ -306,25 +293,11 @@ var allColumns = [
 			return text.planned_end;
 		}
 	},
-	// { name: "early_end", label: "Early Finish", align: "center", min_width: 80, editor: editor.early_end, resize: true },
+	{ name: "start_date", label: "Early Start", align: "center", min_width: 80, editor: editor.start_date, resize: true }, 
-	// {
+	{ name: "end_date", label: "Early Finish", align: "center", min_width: 80, editor: editor.end_date, resize: true },
-	// 	name: "early_end", label: "Early Finish", align: "center", min_width: 80, editor: editor.early_end, resize: true, template: function (text) {
-	// 		let start;
-	// 		let end;
-	// 		text.planned_start ? start = text.planned_start : start = text.start_date;
-	// 		text.planned_end ? end = text.planned_end : end = text.end_date;
-
-	// 		let plannedDuration = gantt.calculateDuration({
-	// 			start_date: new Date(start),
-	// 			end_date: new Date(end)
-	// 		})
-	// 		return moment(text.start_date).add(plannedDuration-1, 'days').format('YYYY-MM-DD');
-	// 		// return text.planned_end;
-	// 	}
-	// }, 
-	{ name: "early_end", label: "Early Finish", align: "center", min_width: 80, resize: true },
-	{ name: "end_date", label: "Actual Finish", align: "center", min_width: 80, resize: true },
 
+	{ name: "actual_start", label: "Actual Start", align: "center", min_width: 80, resize: true },
+	{ name: "actual_end", label: "Actual Finish", align: "center", min_width: 80, resize: true }, 
 	{
 		name: "bobot_planning", label: "Bobot (%)", align: "center", editor: editor.bobot_planning, resize: true, min_width: 115, template: function (text) {
 			let bobot = parseFloat(text.bobot_planning);
@@ -381,7 +354,7 @@ var allColumns = [
 		})
 		return plannedDuration;
 	}},
-	{ name: "duration", label: "Actual Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration },
+	{ name: "duration", label: "Duration (Day)", align: "center", min_width: 50, resize: true, editor: editor.duration },
 	{
 		name: "rencana_biaya", label: "Cost Planning", align: "right", min_width: 100, resize: true, template: function (text) {
 			if (!text.rencana_biaya) {
@@ -549,8 +522,8 @@ let columnShows = {
 	planned_start: false,
 	planned_end: false,
 	planned_duration: false,
-	early_start: false,
+	actual_start: false,
-	early_end: false,
+	actual_end: false,
 	duration: true,
 	rencana_biaya: true,
 	cost_actual: true,
@@ -577,8 +550,8 @@ gantt.config.columns = createColumnsConfig({
 	planned_start: true,
 	planned_end: true,
 	planned_duration: true,
-	early_start: true,
+	actual_start: true,
-	early_end: true,
+	actual_end: true,
 	duration: true,
 	rencana_biaya: true,
 	cost_actual: true,