fixed layout filter

main_new_version.php

@@ -565,13 +565,13 @@ switch ($action) {
         break;
     case 'save_layout':
         $management = json_encode($_POST["management"]);
-        $dashboard_filter = json_encode($_POST["dashboard_filter"]);
+        $dashboard_filter = json_encode($_POST["dashboardObj"]);
         $_param = "";
         if(!empty($_POST["management"])){
-            $_param = " management = '$management' ";
+            $_param .= " management = '$management' ";
         }
-        if(!empty($_POST["dashboard_filter"])){
-            $_param = ",dashboard_filter = '$dashboard_filter' ";
+        if(!empty($dashboard_filter)){
+            $_param .= ",dashboard_filter = '$dashboard_filter' ";
         }
         if(!empty($_param)){
             common::excuteUpdateSql("update public.ra_online_user set $_param where lower(user_login) = '" . strtolower(_getLoginName()) . "'");

utils/common.class.php

@@ -1111,7 +1111,18 @@ class common {
                 $Management[$key]['switchValue'] = $val['switchValue'] == "true" ? true : false;
             }
         }
-        return  array("Management" => $Management,"dashboard_filter" =>$user_management_data['dashboard_filter']);
+        $user_dashboard_filter = $user_management_data['dashboard_filter'];
+        $dashboard_filter  =array();
+        if(!empty($user_dashboard_filter)){
+            $dashboard_filter = json_decode($user_dashboard_filter,true);
+            if(!empty($dashboard_filter['date_end'])){
+                $dashboard_filter['date_end'] = common::usDate2sqlDate($dashboard_filter['date_end']);
+            }
+            if(!empty($dashboard_filter['date_start'])){
+                $dashboard_filter['date_start'] = common::usDate2sqlDate($dashboard_filter['date_start']);
+            }
+        }
+        return  array("Management" => $Management,"dashboard_filter" =>$dashboard_filter);
     }
 
     public static function getItemStyle($type,$code){