Change working point fields

src/Map/Layers/FilteredWorkingPoints.jsx

@@ -16,8 +16,8 @@ export const FilteredWorkingPoints = () => {
   const regionFilterExpression = useRegionFilterExpression(region);
 
   const deltaExpression = [
-    [">=", ["get", "delta_current"], deltaTraffic[0]],
+    [">=", ["get", "delta_first"], deltaTraffic[0]],
-    ["<=", ["get", "delta_current"], deltaTraffic[1]],
+    ["<=", ["get", "delta_first"], deltaTraffic[1]],
   ];
 
   const factExpression = [

src/Map/Popup/mode-popup/config.js

@@ -62,8 +62,9 @@ export const residentialPopupConfig = [
 ];
 
 export const workingPointFields = [
+  { name: "План", field: "plan_first" },
   { name: "Факт", field: "fact" },
-  { name: "Расхождение с прогнозом", field: "delta_current" },
+  { name: "Расхождение с прогнозом", field: "delta_first" },
   { name: "Зрелость", field: "age_day" },
   { name: "id постамата", field: "postamat_id", empty: "Не указан" },
 ];

src/modules/Sidebar/WorkingPointsFilters/WorkingPointsFilters.jsx

@@ -23,7 +23,7 @@ const useGetDataRange = () => {
     {
       select: (data) => {
         return {
-          deltaTraffic: [data.delta_current[0], data.delta_current[1]],
+          deltaTraffic: [data.delta_first[0], data.delta_first[1]],
           factTraffic: [data.fact[0], data.fact[1]],
           age: [data.age_day[0], data.age_day[1]],
         };

src/modules/Table/WorkingTable/WorkingTable.jsx

@@ -25,7 +25,7 @@ export const WorkingTable = ({ fullWidth }) => {
         page,
         page_size: pageSize,
         "status[]": [STATUSES.working],
-        "delta_current[]": deltaTraffic,
+        "delta_first[]": deltaTraffic,
         "fact[]": factTraffic,
         "age_day[]": age,
       });

src/modules/Table/WorkingTable/useColumns.jsx

@@ -64,9 +64,9 @@ export const useColumns = () => {
         ellipsis: true,
       },
       {
-        title: "Прогнозный трафик",
+        title: "План",
-        dataIndex: "prediction_current",
+        dataIndex: "plan_first",
-        key: "prediction_current",
+        key: "plan_first",
         width: "120px",
         ellipsis: true,
       },
@@ -79,8 +79,8 @@ export const useColumns = () => {
       },
       {
         title: "Расхождение с прогнозом",
-        dataIndex: "delta_current",
+        dataIndex: "delta_first",
-        key: "delta_current",
+        key: "delta_first",
         width: "120px",
         ellipsis: true,
       },

src/modules/Table/WorkingTable/useExportWorkingData.js

@@ -14,7 +14,7 @@ export const useExportWorkingData = (enabled, onSettled) => {
     async () => {
       const params = new URLSearchParams({
         "status[]": [STATUSES.working],
-        "delta_current[]": deltaTraffic,
+        "delta_first[]": deltaTraffic,
         "fact[]": factTraffic,
         "age_day[]": age,
       });