From 1a3f8e3b8c355a4d36114b0c1db882339e261b95 Mon Sep 17 00:00:00 2001 From: RekHoto Date: Wed, 20 Sep 2023 15:29:28 +0400 Subject: [PATCH] new logo, table status filter, disable take to work if updating data --- dist/favicon.ico | Bin 15406 -> 15406 bytes public/favicon.ico | Bin 15406 -> 15406 bytes src/Map/Layers/PendingPoints.jsx | 4 +-- src/Map/Legend.jsx | 2 +- src/api.js | 2 +- src/assets/logopng.png | Bin 6731 -> 7676 bytes src/icons/Logo.jsx | 24 +++--------------- .../PendingPointsFilters/TakeToWorkButton.jsx | 14 ++++++++-- .../Table/PendingTable/usePendingTableData.js | 2 +- 9 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dist/favicon.ico b/dist/favicon.ico index ea447bb2f53975d27abb0cda9557df1767e3a5bf..adce3f389c22a224611d13cdeefea91e3fb70b15 100644 GIT binary patch literal 15406 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 JHBgKO{tu_)P literal 15406 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 F{2!lqJL3QV diff --git a/public/favicon.ico b/public/favicon.ico index ea447bb2f53975d27abb0cda9557df1767e3a5bf..adce3f389c22a224611d13cdeefea91e3fb70b15 100644 GIT binary patch literal 15406 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 JHBgKO{tu_)P literal 15406 zcmeI336xajmB*`raT~{=+xeK&Vq<)eG*aa9Y!#v^!SkPW<^gUq&riSec)KC2Hj8N8&-n3~li=-#5!Jcd3}gmo@Ap35syB4|((H4Qke$!??X*p? zf)umjeR>~n?+gX)e0j{RIf2V)Pqv{f*u_6JebzOt|JQN`LO0>?`XjVletAz>%@xLo zq#4Pdd3lvqK0T>dPM;-7l^Apa}C`84+QC;EL6E&U$-^F^9HXVj?eC-*k) zSnnG~U{FmwWWdt`=I4_{Tss8+ySaY0x;#7wS|X>d$VcRTh$epPW#;_4T+>Ik`=NbA zd?fu2+7k4!1=^mkbmtiiiuD?HbHfRu@A^mavC#jMp}6|#^Ovp+Ud7H%6#p)LXlIxU zKi%y0A!PE06Da=<`kmGZu`$=qg#Ig0#kuxG%HQR`7y1#!c`2s0T+i`1QX{|BiuwYlEyUebF~2)(r zh))dcekXp%S0?Y0Gs#=|9i>)^w#W?=MzcFJaCf$7d3oS{d7YpWCr*#^ppM?=qJ01lyD~(oa7F|HLTPca4dyLprGUSN_(jXwa?}ACr9-_V{_$gzKT( zKy%|6KL+T3!1rabV9Uk%`5W8)QGfX7J->&~$`1OO0YyP;lDxkyPJnlB?xlBepo?JG zRs?Rp4EjSK+ADZxg-1U#KzNsVN6&2TON=1&(LaaS%G%HUtUPw(7aoXd&cv+T`a_?0 zFXz3pgub*GF%rBz1>FN4ZFlY)(ft*~!f$a;VkZ|9&%G&Q^YiV~1VcaRFNG5@^jJMnBt7 zQ&WlknGZKU!`_j#X1@!c_eUUk2RDN6O-uG+*|81>`sHsHhsLaWRVYJ78$F}}C z2gH^mx>Fu2*g1y&=kO#t@9CNNJJnfd=;_&p(RzBx#683L?H9E71p|IjbfJa*zQV#i z!wqA>DcSh*nCYwb?~v&nnRjITYD9DQ;X+^D{UPlqhSoYk{JqPgYG1=WY{TBd+%Ol` zR{95J-&-17ct(Hd8=8F&?-AZ5KF#uuY^?23Eme(;yZR*<3R!!^U(xO|l=MB)(3$Iv zkR39Nrv@J%edNnN2_1MG8E*6OE*N%WhYulp#SEAOO>_K7rKP1OmzFL(V~Vk6NHqH5 z=M7`c2K;tCCh@hANU}>a3c$Hj~(HMs+-7Cd;+5>bPnq;_7#}x0-#M#N0=V zzwqVOerZ0rXFQ#^7Dqyodrmb?49(BYe&dK;5$9vf_`Fs z(kF%`%$S-mLyyDL$9=xL%RF~~R`!CS_o7N_F+Ow~{_G=Yd<=$8jr$+q10F3>tZ6eZ zpE*2P9-f~xLvMC}UuV7Q`*)F>R$q<&7)o;`G>E4pFO;?-YD=evPpdaH=hos->r6=_xzl_7ar>QZ8<#LfsYyg>En0vGos_0 z66N{>_|95v@Hw!*#G2HKol1^Ia48kiE9Y!_hg&F@6XASs{77@vRA*U{ znmWe#ZOx#Pi_?D_QJagHw+FDDmx$rl5mWtpRNY4#V>h1YbklATMc9PxW4gA z{=els@=Gyt-sDK^x3X~{x>5Ech?x`M-A5bHYy9L#79+b`n2TQZr{v-{ z(EIcSF}jEM}ko&EE01)xETI z6nuBnHp8z!4&<7Bk?KeuV^vH~&oF{}hIu?>wZ5azEq*%%{%6@k-YmM^v;9&tWNwf# zdha~Le4%rlV_JR}Jz{TXzm8wMBc`{8Sr0ii#n!ybC+GMDlb*gYqFZCdMmv+s43au; zOm`w+`z1K3^|UuvUL4?r*e ziMA3Mi{6u`Z^zq}56SQUfi>}m%mZha>IQa}2ORa7f9PlYrrOO>jr=09fZ*(kKb+ri zek4eI10MX#ADIK$_jkqY|1NnMY|5@H(w$Oc!h3`LH8J5OxA?7QVwWeGgRghTpUDdc zor}QyZ7?sV$49z)?!()~j^PjNd+`VBcy_Knv2lDbxcv!s$B zmA{;8aL;NfEybeGH1e>{hs=S8UFN~7fq%kUcF42ej^D&iSW|u^HKfV;ozMH_6u)9O zkw>Op;at~&Uuxx?Gb0v2hv$NOEqJ6(hmZ7h$IZnk)*kl#yYNSQnLmE>@OyLQ`Q>QP zx<&lL36nqgnFAO9q+s)CPyU$!C56^-i3PxUpTq{>?yUD-9eNY-=PQPqrdH#gv7>Hb zXJl=FC)Q?5*69C?sx8_G_k4io+j1*^tBJi!9Xd2Gi(k%3Oyb-jn7+^b^&U3A-iw^A z2ITx}c#|6D6YiNr)$-TYWo>?!wp8RGb>-|Chg{<4{p8-Q$Ed4aEBMu68%`xgJ{Orz zjVP%_$Y0hf>H?l_V4E@zg6%c2YvRxv^y@p~Z{V|u`+nQTF04)Pcq{vyw*6TqFX#9* z>rrsb75w2#oO77_f{4~~Ggw{*_da5_cD=_A4uDhSOw8@Xi&g8AsFI#mq%c>C#B^;o z?D2t(Q-4+Lh5SAzsI;1pRlfaACLiEG4v${sKha_gDD;y2>4PIx3n_&{*N z$Nj~ejg~rf39$w9HJfK&p!xHZ^86n7-N^GlmD(kK?KJ9?gSzL>`?G#|_@Vh5-hWM@ zVt+yQ;pqIm(0z?w^w*~kj@0hO-q9=0bKqADgFM89`oWO`dos^Hfi9(89@_bKYms}< zMRMTwbU8aMab2$P<2UP}`-q&Wis?;Z=#+y^;<;VK`J(4p{729+zB_Ng19fJrSoUJ9 zrg>6_juf__t7_EOgQuZfI|37ZC2PB(^iu3z*={%*Zk z>K6-n|80gYF_&{E`o59x`@kXk1%B7xU;`4jIjgAQR7lRJ?VLuQ?6u^(@XqtZ*AC~q zoM*7zXWgdIEB5_d&zAW$jJMCu4gNO$(K!bzXUnP4$XWmf&X;uYmx?9(lO5Q~f*5E2 z@Uf?uW;Qk>zBcLyhl9-*OROa4=kUqI+Qj5-P3%|lL~=$b6ly#(H~7J*;r~^q4jKOn z?3^92wt!RCo~+)u=SI*e3!av8w&`1vr<1s{7P;5f257aMRatP#WOegdrN;JQlY%=( z$HI*l`P-zz=Fx?P|2tfsQPsLrXU;4fUQ-^LMxBfLmo8_xd#y)=Yg7sUOg@Uw94thVHIV;(dhA*DpMcpwFo`!tC6vZ zD`R7_t)gtw=ql3~m7JknSY@iCz^hW9xJqhVoCn_7Km0B>iCr2zJC;4ITTd6i*TysF z?!7ZCFBEI3tHoDJJSp-^#KV_UBb>*7M!rs+=NoQ6BYXojlz3f}1_U^X!b*f{G zdk)0HJ|1QLDJd!9&uwW&QNJ?#n3V=R*Y!O(NoUw@SA z-@@l_sGUCoFAI_Ruen}CTg5xxg2(rHuAlhDPF)@ZyHDzA+zPQ24vZsZD4K!OIy?A+=$oWS_3%irE!m@H*uX7>}}`CJDqLe_xA4{ zvh>USn6BZ6xL;%6tJ{^u#oI2;sa zxV7KV`q=(<;7DWZPFm-#A}t@1Q*be&W(CV=Brn8=2L6{09EI!@hEU zEw<#H^LZT~yDkz;-NyNbpM&RB?9ss&@;|Kfu3np(Zb8?C=lMpkF*L>4JVf*!o%z?K z8Q#FV_v9RNn>@tMc{k@D^sUJ0LE3jEZY6G-4<7QamYnBoh7aOGIrG%LfxQ{IFD=wl z$yjLTn9D9(e`aNQSm$iZL##tPIrFmjgyD~azf6<=D*X>SdUs`+R^{LO|MmK>5;$H7 F{2!lqJL3QV diff --git a/src/Map/Layers/PendingPoints.jsx b/src/Map/Layers/PendingPoints.jsx index 5bbaeae..f87f20f 100644 --- a/src/Map/Layers/PendingPoints.jsx +++ b/src/Map/Layers/PendingPoints.jsx @@ -11,7 +11,6 @@ import { LAYER_IDS } from "./constants"; import { RANGE_FILTERS_KEYS, usePendingPointsFilters } from "../../stores/usePendingPointsFilters"; import { fieldHasChanged, predictionHasChanged } from "../../utils.js"; import { useSourceLayerName } from "../../api.js"; -import { useMode } from "../../stores/useMode.js"; const rawStatusExpression = ["==", ["get", "status"], STATUSES.pending]; @@ -19,7 +18,6 @@ const useFilterExpression = () => { const { filters, ranges } = usePendingPointsFilters(); const { prediction, categories, region } = filters; const { selection } = usePointSelection(); - const { isImportMode } = useMode(); const includedArr = [...selection.included]; const excludedArr = [...selection.excluded]; @@ -50,7 +48,7 @@ const useFilterExpression = () => { ? ["in", ["get", "category"], ["literal", categories]] : true; - const statusExpression = isImportMode ? true : rawStatusExpression; + const statusExpression = rawStatusExpression; const predictionExpression = predictionHasChanged(filters, ranges) ? rawPredictionExpression : [true]; const matchFilterExpression = [ diff --git a/src/Map/Legend.jsx b/src/Map/Legend.jsx index 54fce21..2cd4d06 100644 --- a/src/Map/Legend.jsx +++ b/src/Map/Legend.jsx @@ -21,7 +21,7 @@ const LegendPointItem = ({color, imageSrc, name, hideImage, border}) => { /> )} {!imageSrc && !color && !hideImage && ( - + )} {name} diff --git a/src/api.js b/src/api.js index b35cabd..12b6682 100644 --- a/src/api.js +++ b/src/api.js @@ -26,7 +26,7 @@ export const useDbTableName = () => { export const useSourceLayerName = () => { const {isImportMode} = useMode(); - if (isImportMode) return "public.service_preplacementpoint"; + if (isImportMode) return "public.prepoints_with_dist"; return "public.points_with_dist"; } diff --git a/src/assets/logopng.png b/src/assets/logopng.png index e0c64e072809f1d79fab70534116c2fd09941b45..4a838dce8f479b67f431114aaed595def1d67630 100644 GIT binary patch literal 7676 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 literal 6731 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 MP}dAsg>@tR56wl(RsaA1 diff --git a/src/icons/Logo.jsx b/src/icons/Logo.jsx index dddd395..78beaec 100644 --- a/src/icons/Logo.jsx +++ b/src/icons/Logo.jsx @@ -1,24 +1,8 @@ -export const Logo = ({ width = 40, height = 40, fill }) => { +import logo from "../assets/logopng.png"; + +export const Logo = ({ width = 40, height = 40 }) => { return ( - - - - - - + {"logo"}/ ); }; diff --git a/src/modules/Sidebar/PendingPointsFilters/TakeToWorkButton.jsx b/src/modules/Sidebar/PendingPointsFilters/TakeToWorkButton.jsx index 64bf172..3c61b58 100644 --- a/src/modules/Sidebar/PendingPointsFilters/TakeToWorkButton.jsx +++ b/src/modules/Sidebar/PendingPointsFilters/TakeToWorkButton.jsx @@ -2,11 +2,16 @@ import { Alert, Button, Modal, Spin } from "antd"; import { useQueryClient } from "@tanstack/react-query"; import { usePointSelection } from "../../../stores/usePointSelection"; import { STATUSES } from "../../../config"; -import { useState } from "react"; +import { useMemo, useState } from "react"; import { useUpdateStatus } from "../../../hooks/useUpdateStatus"; import { ArrowRightOutlined } from "@ant-design/icons"; import { Title } from "../../../components/Title"; import { usePendingPointsFilters } from "../../../stores/usePendingPointsFilters"; +import { useLastMLRun } from "../../../api.js"; + +const TASK_STATUSES = { + finished: "Завершено" +} export const TakeToWorkButton = ({ disabled }) => { const { filters } = usePendingPointsFilters(); @@ -14,6 +19,11 @@ export const TakeToWorkButton = ({ disabled }) => { const { selection } = usePointSelection(); const queryClient = useQueryClient(); const [isModalOpened, setIsModalOpened] = useState(false); + const { data: statusData } = useLastMLRun(); + + const disableButton = useMemo(() => { + return statusData?.task_status !== TASK_STATUSES.finished + }, [statusData]) const { mutate: updateStatus, @@ -79,7 +89,7 @@ export const TakeToWorkButton = ({ disabled }) => { block className={"mt-2"} onClick={() => setIsModalOpened(true)} - disabled={disabled} + disabled={disabled || disableButton} > Взять в работу diff --git a/src/modules/Table/PendingTable/usePendingTableData.js b/src/modules/Table/PendingTable/usePendingTableData.js index 0426c91..a6d5075 100644 --- a/src/modules/Table/PendingTable/usePendingTableData.js +++ b/src/modules/Table/PendingTable/usePendingTableData.js @@ -27,7 +27,7 @@ export const usePendingTableData = (page, resetPage, pageSize, setPageSize, sort }); appendFiltersInUse(params, filters, ranges); - if (!isImportMode) params.append("status[]", STATUSES.pending) + if (!isImportMode) params.append("status[]", [STATUSES.pending, STATUSES.cancelled].join(",")) return params; }