@banch0u/core-project-test-repository 2.3.24 → 2.3.25

package/dist/helpers/enums.js

@@ -14,4 +14,17 @@ export var AttestationType = [{
 }, {
   id: 2,
   text: "Nəqliyyat vasitəsi"
-}];
+}];
+export var FuelCategory = [{
+  id: 1,
+  text: "Dizel"
+}, {
+  id: 2,
+  text: "Benzin"
+}];
+export var enumText = function enumText(list, id) {
+  var _list$find;
+  return (_list$find = list.find(function (item) {
+    return item.id === id;
+  })) === null || _list$find === void 0 ? void 0 : _list$find.text;
+};

package/dist/pages/Questionnnaires/QuestionnairesAttestationsContent/index.js

@@ -25,7 +25,7 @@ import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
 import { addAttestations, deleteAttestations, editAttestations, getAttestations, attestationsVisibility } from "../../../store/slices/questionnaire";
 import Select from "../../../components/Select";
-import { AttestationType } from "../../../helpers/enums";
+import { AttestationType, enumText } from "../../../helpers/enums";
 import text from "../../../translations/index.json";
 import { useLang } from "../../../hooks/useLang";
 var Content = Layout.Content;
@@ -125,12 +125,6 @@ var QuestionnairesAttestationsContent = function QuestionnairesAttestationsConte
       }
     });
   };
-  var idFinder = function idFinder(id) {
-    var _AttestationType$find;
-    return (_AttestationType$find = AttestationType.find(function (item) {
-      return item.id === id;
-    })) === null || _AttestationType$find === void 0 ? void 0 : _AttestationType$find.text;
-  };
   var data = [];
   if (Attestations !== null && Attestations !== void 0 && Attestations.items) {
     var _Attestations$items;
@@ -142,7 +136,7 @@ var QuestionnairesAttestationsContent = function QuestionnairesAttestationsConte
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
         fullName: dataObj === null || dataObj === void 0 ? void 0 : dataObj.fullName,
         attestationType: (_dataObj$attestationT = dataObj === null || dataObj === void 0 || (_dataObj$attestationT2 = dataObj.attestationType) === null || _dataObj$attestationT2 === void 0 ? void 0 : _dataObj$attestationT2.id) !== null && _dataObj$attestationT !== void 0 ? _dataObj$attestationT : dataObj === null || dataObj === void 0 ? void 0 : dataObj.attestationType,
-        attestationTypeText: idFinder((_dataObj$attestationT3 = dataObj === null || dataObj === void 0 || (_dataObj$attestationT4 = dataObj.attestationType) === null || _dataObj$attestationT4 === void 0 ? void 0 : _dataObj$attestationT4.id) !== null && _dataObj$attestationT3 !== void 0 ? _dataObj$attestationT3 : dataObj === null || dataObj === void 0 ? void 0 : dataObj.attestationType),
+        attestationTypeText: enumText(AttestationType, (_dataObj$attestationT3 = dataObj === null || dataObj === void 0 || (_dataObj$attestationT4 = dataObj.attestationType) === null || _dataObj$attestationT4 === void 0 ? void 0 : _dataObj$attestationT4.id) !== null && _dataObj$attestationT3 !== void 0 ? _dataObj$attestationT3 : dataObj === null || dataObj === void 0 ? void 0 : dataObj.attestationType),
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1"
       };

package/dist/pages/Questionnnaires/QuestionnairesBarrelContent/index.js

@@ -28,7 +28,7 @@ import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
 import { addBarrel, deleteBarrel, editBarrel, barrelVisibility, getBarrel, getFieldAll } from "../../../store/slices/questionnaire";
 import Select from "../../../components/Select";
-import { typeENUM } from "../../../helpers/enums";
+import { typeENUM, enumText } from "../../../helpers/enums";
 import text from "../../../translations/index.json";
 import { useLang } from "../../../hooks/useLang";
 var Option = AntdSelect.Option;
@@ -130,12 +130,6 @@ var QuestionnairesBarrelContent = function QuestionnairesBarrelContent() {
       }
     });
   };
-  var idFinder = function idFinder(id) {
-    var _typeENUM$find;
-    return (_typeENUM$find = typeENUM.find(function (item) {
-      return item.id === id;
-    })) === null || _typeENUM$find === void 0 ? void 0 : _typeENUM$find.text;
-  };
   var data = [];
   if (barrel !== null && barrel !== void 0 && barrel.items) {
     var _barrel$items;
@@ -146,7 +140,7 @@ var QuestionnairesBarrelContent = function QuestionnairesBarrelContent() {
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1",
-        typeText: idFinder(dataObj.type.id),
+        typeText: enumText(typeENUM, dataObj.type.id),
         type: dataObj.type.id,
         fieldName: dataObj.fieldName
       };

package/dist/pages/Questionnnaires/QuestionnairesFieldContent/index.js

@@ -28,7 +28,7 @@ import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
 import { addField, deleteField, editField, fieldVisibility, getField } from "../../../store/slices/questionnaire";
 import Select from "../../../components/Select";
-import { typeENUM } from "../../../helpers/enums";
+import { typeENUM, enumText } from "../../../helpers/enums";
 import text from "../../../translations/index.json";
 import { useLang } from "../../../hooks/useLang";
 var Content = Layout.Content;
@@ -129,12 +129,6 @@ var QuestionnairesFieldContent = function QuestionnairesFieldContent() {
       }
     });
   };
-  var idFinder = function idFinder(id) {
-    var _typeENUM$find;
-    return (_typeENUM$find = typeENUM.find(function (item) {
-      return item.id === id;
-    })) === null || _typeENUM$find === void 0 ? void 0 : _typeENUM$find.text;
-  };
   var data = [];
   if (fields !== null && fields !== void 0 && fields.items) {
     var _fields$items;
@@ -145,7 +139,7 @@ var QuestionnairesFieldContent = function QuestionnairesFieldContent() {
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1",
-        typeText: idFinder(dataObj.type.id),
+        typeText: enumText(typeENUM, dataObj.type.id),
         type: dataObj.type.id
       };
     });

package/dist/pages/Questionnnaires/QuestionnairesFuelTypesContent/constant.js

@@ -4,7 +4,7 @@ import style from "../Questionnaires.module.scss";
 import { setDeleteModalVisible } from "../../../store/slices/global";
 import { DeleteIconQ, EditIcon } from "../../../assets/icons";
 export var getStreetColumns = function getStreetColumns(t, onEditClick, onDelete, onStatusChange, dispatch, innerW) {
-  var _t$fields, _t$fields2;
+  var _t$fields, _t$fields2, _t$fields3;
   return [{
     title: "№",
     dataIndex: "num",
@@ -18,7 +18,13 @@ export var getStreetColumns = function getStreetColumns(t, onEditClick, onDelete
     disabled: true,
     ellipsis: true
   }, {
-    title: t === null || t === void 0 || (_t$fields2 = t.fields) === null || _t$fields2 === void 0 ? void 0 : _t$fields2.status,
+    title: t === null || t === void 0 || (_t$fields2 = t.fields) === null || _t$fields2 === void 0 ? void 0 : _t$fields2.fuelCategory,
+    dataIndex: "fuelCategoryText",
+    width: innerW,
+    ellipsis: true,
+    filter: false
+  }, {
+    title: t === null || t === void 0 || (_t$fields3 = t.fields) === null || _t$fields3 === void 0 ? void 0 : _t$fields3.status,
     key: "status",
     disabled: true,
     filter: false,

package/dist/pages/Questionnnaires/QuestionnairesFuelTypesContent/index.js

@@ -6,7 +6,7 @@ import React from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Cookies from "js-cookie";
 import style from "../Questionnaires.module.scss";
-import { Form, Input, Layout } from "antd";
+import { Form, Input, Layout, Select as AntdSelect } from "antd";
 import { PlusIcon } from "../../../assets/icons";
 import FormModal from "../../../components/FormModal";
 import { useDispatch, useSelector } from "react-redux";
@@ -24,12 +24,15 @@ import Loading from "../../../components/Loading";
 import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
 import { addFuelTypes, deleteFuelTypes, editFuelTypes, getFuelTypes, fuelTypesVisibility } from "../../../store/slices/questionnaire";
+import Select from "../../../components/Select";
+import { FuelCategory, enumText } from "../../../helpers/enums";
 import text from "../../../translations/index.json";
 import { useLang } from "../../../hooks/useLang";
 var Content = Layout.Content;
 var Item = Form.Item;
+var Option = AntdSelect.Option;
 var QuestionnairesFuelTypesContent = function QuestionnairesFuelTypesContent() {
-  var _text$lang, _t$common, _t$titles, _t$common2, _t$common3, _t$common4, _t$common5, _t$fields, _t$common6, _t$common7;
+  var _text$lang, _t$common, _t$titles, _t$common2, _t$common3, _t$common4, _t$common5, _t$fields, _t$fields2, _t$common6, _t$common7;
   var lang = useLang();
   var t = text === null || text === void 0 || (_text$lang = text[lang]) === null || _text$lang === void 0 || (_text$lang = _text$lang.pages) === null || _text$lang === void 0 ? void 0 : _text$lang.questionnaires;
   var _useState = useState(null),
@@ -84,7 +87,8 @@ var QuestionnairesFuelTypesContent = function QuestionnairesFuelTypesContent() {
   var onEdit = useCallback(function (id, record) {
     var data = {
       id: id,
-      name: record === null || record === void 0 ? void 0 : record.name
+      name: record === null || record === void 0 ? void 0 : record.name,
+      fuelCategory: record === null || record === void 0 ? void 0 : record.fuelCategory
     };
     dispatch(editFuelTypes(data));
   }, [dispatch]);
@@ -124,10 +128,13 @@ var QuestionnairesFuelTypesContent = function QuestionnairesFuelTypesContent() {
   if (fuelTypes !== null && fuelTypes !== void 0 && fuelTypes.items) {
     var _fuelTypes$items;
     data = fuelTypes === null || fuelTypes === void 0 || (_fuelTypes$items = fuelTypes.items) === null || _fuelTypes$items === void 0 ? void 0 : _fuelTypes$items.map(function (dataObj, i) {
+      var _dataObj$fuelCategory, _dataObj$fuelCategory2, _dataObj$fuelCategory3, _dataObj$fuelCategory4;
       return {
         num: (fuelTypes === null || fuelTypes === void 0 ? void 0 : fuelTypes.size) * (fuelTypes === null || fuelTypes === void 0 ? void 0 : fuelTypes.page) + i + 1 - (fuelTypes === null || fuelTypes === void 0 ? void 0 : fuelTypes.size),
         id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
+        fuelCategory: (_dataObj$fuelCategory = dataObj === null || dataObj === void 0 || (_dataObj$fuelCategory2 = dataObj.fuelCategory) === null || _dataObj$fuelCategory2 === void 0 ? void 0 : _dataObj$fuelCategory2.id) !== null && _dataObj$fuelCategory !== void 0 ? _dataObj$fuelCategory : dataObj === null || dataObj === void 0 ? void 0 : dataObj.fuelCategory,
+        fuelCategoryText: enumText(FuelCategory, (_dataObj$fuelCategory3 = dataObj === null || dataObj === void 0 || (_dataObj$fuelCategory4 = dataObj.fuelCategory) === null || _dataObj$fuelCategory4 === void 0 ? void 0 : _dataObj$fuelCategory4.id) !== null && _dataObj$fuelCategory3 !== void 0 ? _dataObj$fuelCategory3 : dataObj === null || dataObj === void 0 ? void 0 : dataObj.fuelCategory),
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1"
       };
@@ -175,7 +182,7 @@ var QuestionnairesFuelTypesContent = function QuestionnairesFuelTypesContent() {
     columns: columns,
     selectedColumns: selectedColumns,
     setQuery: setQuery,
-    disabledElementCount: 3,
+    disabledElementCount: 4,
     setPage: setPage
   }))), /*#__PURE__*/React.createElement(Layout, {
     className: style.layout1
@@ -225,7 +232,20 @@ var QuestionnairesFuelTypesContent = function QuestionnairesFuelTypesContent() {
     label: t === null || t === void 0 || (_t$fields = t.fields) === null || _t$fields === void 0 ? void 0 : _t$fields.name
   }, /*#__PURE__*/React.createElement(Input, {
     className: style.modal_input
-  }))), /*#__PURE__*/React.createElement(DeleteModal, {
+  })), /*#__PURE__*/React.createElement(Item, {
+    className: style.label,
+    rules: [{
+      required: true,
+      message: ""
+    }],
+    name: "fuelCategory",
+    label: t === null || t === void 0 || (_t$fields2 = t.fields) === null || _t$fields2 === void 0 ? void 0 : _t$fields2.fuelCategory
+  }, /*#__PURE__*/React.createElement(Select, null, FuelCategory.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: item.id,
+      value: item.id
+    }, item.text);
+  })))), /*#__PURE__*/React.createElement(DeleteModal, {
     onCancel: function onCancel() {
       return dispatch(setDeleteModalVisible(false));
     },

package/dist/pages/Questionnnaires/QuestionnairesVehicleTypesContent/constant.js

@@ -3,8 +3,8 @@ import { Switch, Tooltip } from "antd";
 import style from "../Questionnaires.module.scss";
 import { setDeleteModalVisible } from "../../../store/slices/global";
 import { DeleteIconQ, EditIcon } from "../../../assets/icons";
-export var getStreetColumns = function getStreetColumns(t, onEditClick, onDelete, onStatusChange, dispatch, onTrailerChange) {
-  var _t$fields, _t$fields2, _t$fields4;
+export var getStreetColumns = function getStreetColumns(t, onEditClick, onDelete, onStatusChange, dispatch, onFlagChange) {
+  var _t$fields, _t$fields2, _t$fields4, _t$fields6;
   return [{
     title: "№",
     dataIndex: "num",
@@ -19,9 +19,10 @@ export var getStreetColumns = function getStreetColumns(t, onEditClick, onDelete
   }, {
     title: t === null || t === void 0 || (_t$fields2 = t.fields) === null || _t$fields2 === void 0 ? void 0 : _t$fields2.trailer,
     key: "Qoşqu",
+    dataIndex: "isTrailer",
     disabled: false,
-    filter: true,
-    render: function render(data) {
+    filter: false,
+    render: function render(_, data) {
       var _t$fields3;
       return /*#__PURE__*/React.createElement(Tooltip, {
         placement: "top",
@@ -30,12 +31,31 @@ export var getStreetColumns = function getStreetColumns(t, onEditClick, onDelete
         size: "medium",
         checked: data === null || data === void 0 ? void 0 : data.isTrailer,
         onChange: function onChange(checked) {
-          return onTrailerChange(data, checked, dispatch);
+          return onFlagChange(data, "isTrailer", checked);
+        }
+      }));
+    }
+  }, {
+    title: t === null || t === void 0 || (_t$fields4 = t.fields) === null || _t$fields4 === void 0 ? void 0 : _t$fields4.passenger,
+    key: "Sərnişin",
+    dataIndex: "isPassenger",
+    disabled: false,
+    filter: false,
+    render: function render(_, data) {
+      var _t$fields5;
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "top",
+        title: t === null || t === void 0 || (_t$fields5 = t.fields) === null || _t$fields5 === void 0 ? void 0 : _t$fields5.passenger
+      }, /*#__PURE__*/React.createElement(Switch, {
+        size: "medium",
+        checked: data === null || data === void 0 ? void 0 : data.isPassenger,
+        onChange: function onChange(checked) {
+          return onFlagChange(data, "isPassenger", checked);
         }
       }));
     }
   }, {
-    title: t === null || t === void 0 || (_t$fields4 = t.fields) === null || _t$fields4 === void 0 ? void 0 : _t$fields4.status,
+    title: t === null || t === void 0 || (_t$fields6 = t.fields) === null || _t$fields6 === void 0 ? void 0 : _t$fields6.status,
     key: "status",
     disabled: true,
     filter: false,

package/dist/pages/Questionnnaires/QuestionnairesVehicleTypesContent/index.js

@@ -1,6 +1,9 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -81,13 +84,29 @@ var QuestionnairesVehicleTypesContent = function QuestionnairesVehicleTypesConte
       return _ref.apply(this, arguments);
     };
   }(), [dispatch]);
+  // Flags toggled since the last fetch, so a quick second toggle doesn't
+  // send the other flag's stale value from the row.
+  var pendingFlags = useRef({});
+  useEffect(function () {
+    pendingFlags.current = {};
+  }, [vehicletype]);
+  var getFlags = useCallback(function (id) {
+    var _vehicletype$items;
+    var row = vehicletype === null || vehicletype === void 0 || (_vehicletype$items = vehicletype.items) === null || _vehicletype$items === void 0 ? void 0 : _vehicletype$items.find(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.id) === id;
+    });
+    return _objectSpread({
+      isTrailer: row === null || row === void 0 ? void 0 : row.isTrailer,
+      isPassenger: row === null || row === void 0 ? void 0 : row.isPassenger
+    }, pendingFlags.current[id]);
+  }, [vehicletype]);
   var onEdit = useCallback(function (id, record) {
-    var data = {
+    var data = _objectSpread({
       id: id,
       name: record === null || record === void 0 ? void 0 : record.name
-    };
+    }, getFlags(id));
     dispatch(editVehicletype(data));
-  }, [dispatch]);
+  }, [dispatch, getFlags]);
   var onStatusChange = useCallback(function (data, checked) {
     var data_ = {
       id: data === null || data === void 0 ? void 0 : data.id,
@@ -95,14 +114,15 @@ var QuestionnairesVehicleTypesContent = function QuestionnairesVehicleTypesConte
     };
     dispatch(vehicletypesVisibility(data_));
   }, [dispatch]);
-  var onTrailerChange = useCallback(function (data, checked) {
-    var data_ = {
+  var onFlagChange = useCallback(function (data, field, checked) {
+    var flags = _objectSpread(_objectSpread({}, getFlags(data === null || data === void 0 ? void 0 : data.id)), {}, _defineProperty({}, field, checked));
+    pendingFlags.current[data === null || data === void 0 ? void 0 : data.id] = flags;
+    var data_ = _objectSpread({
       id: data === null || data === void 0 ? void 0 : data.id,
-      name: data === null || data === void 0 ? void 0 : data.name,
-      isTrailer: checked
-    };
+      name: data === null || data === void 0 ? void 0 : data.name
+    }, flags);
     dispatch(editVehicletype(data_));
-  }, [dispatch]);
+  }, [dispatch, getFlags]);
   var closeOnViewModal = useCallback(function () {
     dispatch(setViewModalVisible(false));
   }, [dispatch]);
@@ -130,21 +150,22 @@ var QuestionnairesVehicleTypesContent = function QuestionnairesVehicleTypesConte
   };
   var data = [];
   if (vehicletype !== null && vehicletype !== void 0 && vehicletype.items) {
-    var _vehicletype$items;
-    data = vehicletype === null || vehicletype === void 0 || (_vehicletype$items = vehicletype.items) === null || _vehicletype$items === void 0 ? void 0 : _vehicletype$items.map(function (dataObj, i) {
+    var _vehicletype$items2;
+    data = vehicletype === null || vehicletype === void 0 || (_vehicletype$items2 = vehicletype.items) === null || _vehicletype$items2 === void 0 ? void 0 : _vehicletype$items2.map(function (dataObj, i) {
       return {
         num: (vehicletype === null || vehicletype === void 0 ? void 0 : vehicletype.size) * (vehicletype === null || vehicletype === void 0 ? void 0 : vehicletype.page) + i + 1 - (vehicletype === null || vehicletype === void 0 ? void 0 : vehicletype.size),
         id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         isTrailer: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isTrailer,
+        isPassenger: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isPassenger,
         className: "rowClassName1"
       };
     });
   }
   var columns = useMemo(function () {
-    return getStreetColumns(t, onEditClick, onDelete, onStatusChange, dispatch, onTrailerChange);
-  }, [t, onEditClick, onDelete, onStatusChange, dispatch, onTrailerChange]);
+    return getStreetColumns(t, onEditClick, onDelete, onStatusChange, dispatch, onFlagChange);
+  }, [t, onEditClick, onDelete, onStatusChange, dispatch, onFlagChange]);
   var _useState1 = useState(columns.map(function (col) {
       return col.dataIndex;
     })),
@@ -184,7 +205,7 @@ var QuestionnairesVehicleTypesContent = function QuestionnairesVehicleTypesConte
     columns: columns,
     selectedColumns: selectedColumns,
     setQuery: setQuery,
-    disabledElementCount: 3,
+    disabledElementCount: 5,
     setPage: setPage
   }))), /*#__PURE__*/React.createElement(Layout, {
     className: style.layout1

package/dist/pages/Questionnnaires/QuestionnairesWellContent/index.js

@@ -27,7 +27,6 @@ import Loading from "../../../components/Loading";
 import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
 import { addWell, deleteWell, editWell, getFieldAll, getWell, wellVisibility } from "../../../store/slices/questionnaire";
-import { typeENUM } from "../../../helpers/enums";
 import Select from "../../../components/Select";
 import text from "../../../translations/index.json";
 import { useLang } from "../../../hooks/useLang";
@@ -131,12 +130,6 @@ var QuestionnairesWellContent = function QuestionnairesWellContent() {
       }
     });
   };
-  var idFinder = function idFinder(id) {
-    var _typeENUM$find;
-    return (_typeENUM$find = typeENUM.find(function (item) {
-      return item.id === id;
-    })) === null || _typeENUM$find === void 0 ? void 0 : _typeENUM$find.text;
-  };
   var data = [];
   if (well !== null && well !== void 0 && well.items) {
     var _well$items;