code

main_new_version.php

@@ -645,7 +645,7 @@ switch ($action) {
                         CASE
                             WHEN ((m_iffbcf is not null or m_iffbcf is null) and m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffdel is null) THEN 'Created'::text
                             WHEN ((m_iffcpu is not null or m_iffrec is not null) and m_iffdep is null and m_iffarr is null and m_iffdel is null) THEN 'Cargo Received'::text
-                            WHEN (m_iffdep is not null and m_iffarr is null and m_iffdel is null) THEN 'Departure'::text
+                            WHEN (m_iffdep is not null and m_iffarr is null and m_iffdel is null) THEN 'Departed'::text
                             WHEN (m_iffarr is not null and m_iffdel is null) THEN 'Arrived'::text
                             WHEN (m_iffdel is not null) THEN 'Completed'::text
                             ELSE 'Created'::text

service/report.class.php

@@ -441,7 +441,11 @@ class report {
                 $temp['field'] = $filed['field_display_name'];
                 $temp['title'] = $filed['field_display_name_user'];
                 $temp['type'] = $filed['field_db'] == "Status" ? "status" : "normal";
-                $temp['formatter'] = "";
+                if($filed['data_type'] == "date"){
+                    $temp['formatter'] = "dateTime";
+                }else{
+                    $temp['formatter'] = "";
+                }
                 $tableColumns[] = $temp;
             }
             $dataReturn['tableColumns'] =  $tableColumns;