Browse Source

Merge pull request 'Fix end date formatting' (#48) from dev-wahyu into staging

Reviewed-on: ordo/adw-backend#48
Reviewed-by: ibnu <ibnu@mail.com>
pull/3/head
ibnu 2 years ago
parent
commit
84ab63434c
  1. 5
      app/Http/Controllers/ActivityController.php

5
app/Http/Controllers/ActivityController.php

@ -396,14 +396,13 @@ class ActivityController extends Controller
} }
foreach ($data['activities'] as $i => $activity_row) { foreach ($data['activities'] as $i => $activity_row) {
$startDate = \DateTime::createFromFormat('d-m-y', $activity_row['start_date']); $startDate = \DateTime::createFromFormat('d-m-y', $activity_row['start_date']);
$endDate = \DateTime::createFromFormat('d-m-y', $activity_row['end_date']); $endDate = \DateTime::createFromFormat('d-m-y H:i:sO', $activity_row['end_date']);
$input['name'] = $activity_row['name']; $input['name'] = $activity_row['name'];
$input['proyek_id'] = $projectId; $input['proyek_id'] = $projectId;
$input['version_gantt_id'] = $data['ganttId']; $input['version_gantt_id'] = $data['ganttId'];
$input['parent_id'] = null; $input['parent_id'] = null;
$input['start_date'] = $startDate->format('Y-m-d'); $input['start_date'] = $startDate->format('Y-m-d');
$input['end_date'] = $endDate->format('Y-m-d'); $input['end_date'] = $endDate->format('Y-m-d H:i:sO');
$input['duration'] = $activity_row['duration']; $input['duration'] = $activity_row['duration'];
$input['bobot_planning'] = $activity_row['weight']; $input['bobot_planning'] = $activity_row['weight'];
$input['persentase_progress'] = 0; $input['persentase_progress'] = 0;

Loading…
Cancel
Save