From 02d4f727205f7397b34f7a6edbf17e4650d853ff Mon Sep 17 00:00:00 2001 From: Dr Masroor Ehsan Date: Sun, 19 Jan 2025 11:31:24 +0600 Subject: [PATCH] wip --- app/DataTables/WorklistDataTable.php | 24 +++++++++++++++--- app/Models/Study.php | 1 + resources/imgs/assign.png | Bin 773 -> 902 bytes resources/imgs/assigned.png | Bin 0 -> 1051 bytes resources/imgs/lock.png | Bin 0 -> 563 bytes .../views/_partials/_img-tooltip.blade.php | 1 + .../views/staff/worklist/index.blade.php | 9 +++++++ 7 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 resources/imgs/assigned.png create mode 100644 resources/imgs/lock.png create mode 100644 resources/views/_partials/_img-tooltip.blade.php diff --git a/app/DataTables/WorklistDataTable.php b/app/DataTables/WorklistDataTable.php index 85afa36..ebbac8a 100644 --- a/app/DataTables/WorklistDataTable.php +++ b/app/DataTables/WorklistDataTable.php @@ -274,11 +274,27 @@ private function physicianColumn(Study $study): ?string { $user = $study->readingPhysician; if ($user === null) { + $html = ''; + if ($study->assigned_at !== null) { - return ''; + $html .= Blade::render('_partials._img-tooltip', + [ + 'src' => asset('imgs/assigned.png'), + 'class' => 'msg-icon', + 'tip' => 'Assigned on ' . $study->assigned_at->format(self::DATE_FORMAT_LONG), + ]); } - return null; + if ($study->isLocked()) { + $html .= Blade::render('_partials._img-tooltip', + [ + 'src' => asset('imgs/lock.png'), + 'class' => 'ms-1 msg-icon', + 'tip' => 'Locked on ' . $study->locked_at->format(self::DATE_FORMAT_LONG), + ]); + } + + return $html; } $dt = $study->read_at; @@ -317,7 +333,7 @@ private function renderCustomColumns(): array case WorklistColumn::AssignedPhysician: $columns[$col->value] = static function (Study $study) { if ($study->assigned_at !== null) { - return ''; + return ''; } return null; @@ -435,7 +451,7 @@ private function generateActionButtons(Study $study): string $btns[] = $this->renderImageLink($study->hash, 'info.png', 'showStudy', 'Info'); break; case WorklistButton::Assign: - $btns[] = $this->renderImageLink($study->hash, 'doctor.png', 'show-assign', 'Assign'); + $btns[] = $this->renderImageLink($study->hash, 'assign.png', 'show-assign', 'Assign'); break; case WorklistButton::Notes: $btns[] = $this->renderImageLink($study->hash, 'chat.png', 'show-notes', 'Chat'); diff --git a/app/Models/Study.php b/app/Models/Study.php index eaa7086..7a5d516 100644 --- a/app/Models/Study.php +++ b/app/Models/Study.php @@ -492,6 +492,7 @@ protected function casts(): array 'read_at' => 'immutable_datetime', 'assigned_at' => 'immutable_datetime', 'study_date' => 'immutable_datetime', + 'locked_at' => 'immutable_datetime', 'patient_birthdate' => 'immutable_date', ]; } diff --git a/resources/imgs/assign.png b/resources/imgs/assign.png index 36f9208c0ab42ee22d676e11425c179d07e9ee49..013c407ecb6d830a0554555e1b5a4beb5ec05f37 100644 GIT binary patch delta 844 zcmV-S1GD^v28IWaBoYa5NLh0L006N7006N8#w|&Wkwzzf0~1L^K~zYIos~;yR96^) zzyHilrb*Dw_#_W1RcBGPBD(Pfjj1TOP-uNnk*bTDuC(1m(n7gDO3gy65ydJfVgzf% zLMcdFAMK`s3w0?)NE6d2rZv+s&P-nC?_wt7y*GDe(0_OCf6n)v*Zq$W2<`i>nruZY zu$31*|By|8P6aM77;BSNZZ_DzT!;_;=yDY!gEvr?0g!&&OSZoupZ=ZL*jh;(A9@vm z@wJAZ?=8S{{+XWadn6-!UIji;fNTx4EBs9Y`SRfe+I1y+EA{1oE&XkisGWP3n zcs{IOFfe?Ccx4mlnjC)YDUds8m7nP9J?UGpu?K+VpcwQw_1sB;45FX<1e@F9w)V|u zm)5Q{Z@rr^b4OBI!%$@8-UH{)A8u5BpI9+pq0c0000K_zwDh&kE z>d;Aah-0=G$WW0?qO>LfX^Jf_C6J*}!9l7GRctD^!#mI1yu26dg~R>5^ZlOhIq%+c z@B0-gC2gZ9ilZ0_dnx8l+zwkxDXq7E3P4KffT6%UxQ~?CKiG}m*U;S(|1`eAnI>=; zS3~4J7Vs`!!&8xb07ruVaxK0W-$(qHb@4Z|s#h`GRAI)S4es0V+=uJo`x;N?F#sI7~cZ&SV9h$3`xmQc@8+uomEZ4MP2x!B=53=x<1}PdrcXL4e<)sELn%;g{NG zr|^x{lI&H^MAf0s;7{z}cul+;TOqiNiLmAHZB?Cw(M;(o9zy-hizJ zHr;?#1)S?p9v-nl^>I4p`37vh#>vN8%#$6;6WW&G_n3zou%Q~KDZz2rR<`F84X-+> zeAR8)sa3A+c3_hYab3!G{|$bBRc=U8CkFXS2;IY{VfVs!<&djpC$y~u`9ur(f`ctu z*@c#v=L27Xxp+8RBlTb@uwC51=V3qKVPH$>sl~n#*c?n%54DrK8UF9^LPM1&?X~JA z`ZDZt_@`hns=14SAXIO)=#V=}dBrRScQ$;_#`-_RU`6~WNDEQ@ANVPMuj-H_eZjq} z{0@8(S{L)Xs0%-48`HXh|Ir9l>`iq3n;=N1vyDp_{~rm)v$zL1weL2~i0@}fKEbia z5I+{&s@vY$hc^U_X3MpMOL!H%8K*aVmx7aU3nK^gTB_>8MSCCk%6<;ZeY??holROr w2sVzQD4xSB_Wy06Jaii!F|VhT?zCw<0$R=xQ9s=<761SM07*qoM6N<$f~H7ZVE_OC diff --git a/resources/imgs/assigned.png b/resources/imgs/assigned.png new file mode 100644 index 0000000000000000000000000000000000000000..02be6861576f991c3a3ac16c19b375db00fc3e58 GIT binary patch literal 1051 zcmV+$1mydPP)+N_jPbCOe2Q@psV(VXt;)W(<$U_6>Zv_6(-tvyd~ZkQ(y;B-3KyluNM#wegL z)*nPONC8;2`sS#_q@)$IpYG)t!~fULk)ZlUqx<`KcQ49|B$Kp~K*z}og+Xt3ouwMu<(RQRIDpA`uuk3mL z81R;mVpvFV5qJ-%1+3Y+Xy*W+H8C-%=5TA9@};Fmf}JOh({|)@zB$pMCxeqx#!1^# z;*|)v+Bk*NjAd}El(Hu$H_zSt#g~!8u-2bXoI8%xGOzKL`NYbiRFri+ zZO_>J(tnNdp3C}j*H}0-8Iq0|2IsZbO&5P2ZM-oU4u{F9%Hx*0{CS&Gmcm==!&~Z; z2{$>dp+o0l--tqp^6b34SS52Xc_m0kV>@GAmm;x+43dC=5aOsYrtI;JPtLz9W(BWK zqC*;h>0hVme!YuOFidi8a-?RqMFQ9$glGV&j4^Sk9*-Sp*vf_{HqH^XEGr^<>gAKT zylzUKE2U@OX=eVIq2i6ZarxZXAsZpYpAG;iF`-MG9E^vF^h_dnu zT3VV31w*9Wna&-oW$-{hg*$F1#lI4O(8LVaddH0kn|1-b>vXxcAMZY+EX#^14sc=U zJav!Nvijjn3U?GQSku41kI}D3G=^e_l#U0IlatjaO&=~QUUAnw;jj6k;De@2H3!bH*9Zj{kOrF0R`*<-4**i-kt)M8VxRhTi_HheC!5r2Hc=u z>MF!>Gh7bftazNkdW2AbbIhA>0yqV4?rKD!ToxyQQ?~h)ur36!We8EiJ^r`D<8I>9 z3%}+}1N$?vD80=Qt&9pUlKqFLvhP8qE$qV|0oYCqUTT%@v+KQ!L5lG)Z|YTrOnz^fp{uSJUzkcRe^i?s^jWgq8i-ER~)67o1aHY z$w@ZLy=~JKY5E(1u{M*@c8g3V=W>)Iz9arWd;sJva|jq@Zwmkb002ovPDHLkV1hjC B?ArhU literal 0 HcmV?d00001 diff --git a/resources/views/_partials/_img-tooltip.blade.php b/resources/views/_partials/_img-tooltip.blade.php new file mode 100644 index 0000000..ba6d37a --- /dev/null +++ b/resources/views/_partials/_img-tooltip.blade.php @@ -0,0 +1 @@ + diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index 7388924..627e457 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -40,6 +40,15 @@ ]) @endsection +@section('page-style') + +@endsection + @section('page-script') @vite([ //'resources/assets/js/forms-pickers.js',