diff --git a/docker-compose.yml b/docker-compose.yml index c622bd6f..0dadbd5b 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,7 @@ services: frontend: build: frontend ports: - - 20081:81 - - 54002:54002 + - 20079:80 volumes: # Re-use local composer cache via host-volume - ~/.composer-docker/cache:/root/.composer/cache:delegated @@ -17,7 +16,7 @@ services: backend: build: backend ports: - - 21081:81 + - 21079:80 volumes: # Re-use local composer cache via host-volume - ~/.composer-docker/cache:/root/.composer/cache:delegated @@ -48,7 +47,7 @@ services: PMA_HOST: mariadb MYSQL_ROOT_PASSWORD: Ss157344121165 ports: - - "8081:83" + - "8079:80" depends_on: - mariadb networks: diff --git a/frontend/modules/histo/views/label-sticker/index-no-auto.php b/frontend/modules/histo/views/label-sticker/index-no-auto.php index 106d9328..473329e3 100755 --- a/frontend/modules/histo/views/label-sticker/index-no-auto.php +++ b/frontend/modules/histo/views/label-sticker/index-no-auto.php @@ -24,31 +24,31 @@ $this->params['breadcrumbs'][] = $this->title;
field($model, 'id_case')->widget(MaskedInput::class, [ - 'mask' => 'A99-99999', - ]) ?> + 'mask' => 'A99-99999', + ]) ?>
field($model, 'no_slide') ?>
field($model, 'label')->dropDownList( - [ - 1 => 'Recut', - 2 => 'Recut1', - 3 => 'Recut2', - 4 => 'Deeper 1', - 5 => 'Deeper 2', - 6 => 'Deeper 3', - 7 => 'Serial cut1', - 8 => 'Serial cut2', - 9 => 'Serial cut3', - 10 => 'Reprocess', - 11 => 'ReEmbedded', - ], - [ - 'prompt' => 'เลือก Label', - ] - ); ?> + [ + 1 => 'Recut', + 2 => 'Recut1', + 3 => 'Recut2', + 4 => 'Deeper 1', + 5 => 'Deeper 2', + 6 => 'Deeper 3', + 7 => 'Serial cut1', + 8 => 'Serial cut2', + 9 => 'Serial cut3', + 10 => 'Reprocess', + 11 => 'ReEmbedded', + ], + [ + 'prompt' => 'เลือก Label', + ] + ); ?>
@@ -74,16 +74,16 @@ $this->params['breadcrumbs'][] = $this->title; load(Yii::$app->request->post())) { ?> -
-
-
- QR Sticker
+
+
+
+ QR Sticker
+
+
+ +
-
- -
-
\ No newline at end of file diff --git a/frontend/modules/pathologist/views/do/surgical.php b/frontend/modules/pathologist/views/do/surgical.php index 1315f778..afef2300 100755 --- a/frontend/modules/pathologist/views/do/surgical.php +++ b/frontend/modules/pathologist/views/do/surgical.php @@ -67,14 +67,14 @@ $histo_he = new ArrayDataProvider([ ?> Final Report', ['/pathologist/do/surgical-final', 'id_case' => $case_surgical->id_case, 'type' => 'final'], ['class' => 'btn btn-block btn-success']) ?> where(['id_case' => $case_surgical->id_case])->andWhere(['in', 'report_type', ['final', 'consult', 'preliminary', 'outlab', 'consult-outlab']])->one())) { ?> - Addendum Report', ['/pathologist/do/surgical-addendum', 'id_case' => $case_surgical->id_case, 'type' => 'addendum'], ['class' => 'btn btn-block btn-primary']) ?> - Addendum Report', ['/pathologist/do/surgical-addendum', 'id_case' => $case_surgical->id_case, 'type' => 'addendum'], ['class' => 'btn btn-block btn-primary']) + Addendum Report', ['/pathologist/do/surgical-addendum', 'id_case' => $case_surgical->id_case, 'type' => 'addendum'], ['class' => 'btn btn-block btn-primary']) ?> + Addendum Report', ['/pathologist/do/surgical-addendum', 'id_case' => $case_surgical->id_case, 'type' => 'addendum'], ['class' => 'btn btn-block btn-primary']) ?> - Corrected Report', ['/pathologist/do/surgical-correct', 'id_case' => $case_surgical->id_case, 'type' => 'corrected'], ['class' => 'btn btn-md btn-warning']) + Corrected Report', ['/pathologist/do/surgical-correct', 'id_case' => $case_surgical->id_case, 'type' => 'corrected'], ['class' => 'btn btn-md btn-warning']) ?> - Revised Report', ['/pathologist/do/surgical-revise', 'id_case' => $case_surgical->id_case, 'type' => 'revised'], ['class' => 'btn btn-md btn-danger']) + Revised Report', ['/pathologist/do/surgical-revise', 'id_case' => $case_surgical->id_case, 'type' => 'revised'], ['class' => 'btn btn-md btn-danger']) ?> - -
- -
+ +
  • + id_case . '[' . ucfirst($case_revise->report_type) . ']-' . $case_revise->pathologist_at, ['/pathologist/do/surgical-revised', 'id_case' => $case_surgical->id_case, 'from_id' => $case_revise->id, 'type' => 'revised'], ['class' => 'dropdown-item']) ?> +
    • + + + +
    andFilterWhere([ @@ -158,7 +158,7 @@ $histo_he = new ArrayDataProvider([ ])->one(); */ ?> where(['id_case' => $case_surgical->id_case])->andWhere(['in', 'report_type', ['outlab']])->one())) { ?> - Outlab Report', ['/pathologist/do/surgical-outlab', 'id_case' => $case_surgical->id_case, 'type' => 'outlab'], ['class' => 'btn btn-block btn-warning']) ?> + Outsource Report', ['/pathologist/do/surgical-outlab', 'id_case' => $case_surgical->id_case, 'type' => 'outlab'], ['class' => 'btn btn-block btn-warning']) ?> andFilterWhere([ @@ -173,13 +173,13 @@ $histo_he = new ArrayDataProvider([ $case_surgical->id_case, 'status' => 2]); if (isset($consult) && $consult->diagnosis_by == 1) { ?> - Consult Report', ['/pathologist/do/surgical-consult', 'id_case' => $case_surgical->id_case, 'type' => 'consult'], ['class' => 'btn btn-block btn-info']) ?> + Consult Report', ['/pathologist/do/surgical-consult', 'id_case' => $case_surgical->id_case, 'type' => 'consult'], ['class' => 'btn btn-block btn-info']) ?>
    where(['id_case' => $case_surgical->id_case])->andWhere(['in', 'report_type', ['consult-outlab']])->one())) { ?> - Consult Outlab Report', ['/pathologist/do/surgical-consult-outlab', 'id_case' => $case_surgical->id_case, 'type' => 'consult-outlab'], ['class' => 'btn btn-block btn-warning']) ?> + Consult Outlab Report', ['/pathologist/do/surgical-consult-outlab', 'id_case' => $case_surgical->id_case, 'type' => 'consult-outlab'], ['class' => 'btn btn-block btn-warning']) ?>
    @@ -312,10 +312,10 @@ $histo_he = new ArrayDataProvider([
    render('_quality_assessment_he_surgical', [ - 'form' => $form, - 'slide_qa_he' => $slide_qa_he, - 'case_surgical' => $case_surgical - ]) + 'form' => $form, + 'slide_qa_he' => $slide_qa_he, + 'case_surgical' => $case_surgical + ]) ?>
    @@ -529,66 +529,66 @@ $histo_he = new ArrayDataProvider([
    where([ - 'id_case' => $case_surgical->id_case - ])->count() > 0) { ?> - new ActiveDataProvider([ - 'query' => SurgicalDiagnosis::find()->andFilterWhere([ - 'id_case' => $case_surgical->id_case - ]), - 'sort' => [ - 'defaultOrder' => [ - 'pathologist_at' => SORT_DESC - ] - ] + 'id_case' => $case_surgical->id_case + ])->count() > 0) { ?> + new ActiveDataProvider([ + 'query' => SurgicalDiagnosis::find()->andFilterWhere([ + 'id_case' => $case_surgical->id_case ]), - 'tableOptions' => ['class' => 'table align-middle table-hover m-0 truncate'], - 'layout' => "{summary}
    \n{items}\n
    {pager}
    ", - 'columns' => [ - ['class' => 'yii\grid\SerialColumn'], - 'id_case', - 'pathologist_at', - [ - 'attribute' => 'status_id', - 'value' => function ($model) { - // return isset($model->status) ? Html::encode($model->status->name) : ''; - return isset($model->status) ? ($model->status->name) : ''; - } - ], - [ - 'class' => 'yii\grid\ActionColumn', - 'template' => '{view}', - 'buttons' => [ - 'view' => function ($url, $model, $key) { - if ($model->status_id >= 4) { - $ap = ''; - $approve = ApproveStatus::findOne(['id_case' => $model->id_case, 'report_type' => $model->report_type, 'ref_id' => $model->id]); - if ($approve && $approve->approve_status < 4) { - return 'รอตรวจสอบ'; - } - $case_type = Yii::$app->pathology->getCaseType($model->id_case); - $case = Yii::$app->pathology->getCase($model->id_case); - - if ($model->report_type == 'outlab') { - foreach ($model->getReport() as $file => $val) { - return Html::a(' View Report', Yii::getAlias('@web') . '/' . $model->uploadReportFolder . '/' . $val, ['class' => 'btn btn-md btn-info btn-block', 'target' => '_blank']); - } - } elseif ($model->report_type == 'consult-outlab') { - foreach ($model->getConsultReport() as $file => $val) { - return Html::a(' View Report', Yii::getAlias('@web') . '/' . $model->uploadConsultReportFolder . '/' . $val, ['class' => 'btn btn-md btn-info btn-block', 'target' => '_blank']); - } - } else { - return Html::a(' View Report', ['/report/case/' . $case_type . '-pdf', 'id_case' => $model->id_case, 'report_type' => $model->report_type, 'id' => $model->id, 'mode' => 'final', 'file' => false, 'watermark' => false], ['class' => 'btn btn-md btn-info btn-block', 'target' => '_blank']) . $ap; - } - } - }, - ], + 'sort' => [ + 'defaultOrder' => [ + 'pathologist_at' => SORT_DESC ] ] - ]) ?> + ]), + 'tableOptions' => ['class' => 'table align-middle table-hover m-0 truncate'], + 'layout' => "{summary}
    \n{items}\n
    {pager}
    ", + 'columns' => [ + ['class' => 'yii\grid\SerialColumn'], + 'id_case', + 'pathologist_at', + [ + 'attribute' => 'status_id', + 'value' => function ($model) { + // return isset($model->status) ? Html::encode($model->status->name) : ''; + return isset($model->status) ? ($model->status->name) : ''; + } + ], + [ + 'class' => 'yii\grid\ActionColumn', + 'template' => '{view}', + 'buttons' => [ + 'view' => function ($url, $model, $key) { + if ($model->status_id >= 4) { + $ap = ''; + $approve = ApproveStatus::findOne(['id_case' => $model->id_case, 'report_type' => $model->report_type, 'ref_id' => $model->id]); + if ($approve && $approve->approve_status < 4) { + return 'รอตรวจสอบ'; + } + $case_type = Yii::$app->pathology->getCaseType($model->id_case); + $case = Yii::$app->pathology->getCase($model->id_case); + + if ($model->report_type == 'outlab') { + foreach ($model->getReport() as $file => $val) { + return Html::a(' View Report', Yii::getAlias('@web') . '/' . $model->uploadReportFolder . '/' . $val, ['class' => 'btn btn-md btn-info btn-block', 'target' => '_blank']); + } + } elseif ($model->report_type == 'consult-outlab') { + foreach ($model->getConsultReport() as $file => $val) { + return Html::a(' View Report', Yii::getAlias('@web') . '/' . $model->uploadConsultReportFolder . '/' . $val, ['class' => 'btn btn-md btn-info btn-block', 'target' => '_blank']); + } + } else { + return Html::a(' View Report', ['/report/case/' . $case_type . '-pdf', 'id_case' => $model->id_case, 'report_type' => $model->report_type, 'id' => $model->id, 'mode' => 'final', 'file' => false, 'watermark' => false], ['class' => 'btn btn-md btn-info btn-block', 'target' => '_blank']) . $ap; + } + } + }, + ], + ] + ] + ]) ?>
    registerJs("CKEDITOR.config.scayt_autoStartup = true;") - ?> + ?>
    \ No newline at end of file diff --git a/frontend/modules/pathologist/views/task/surgical-new.php b/frontend/modules/pathologist/views/task/surgical-new.php index 013fb5bc..cc872c09 100755 --- a/frontend/modules/pathologist/views/task/surgical-new.php +++ b/frontend/modules/pathologist/views/task/surgical-new.php @@ -179,7 +179,7 @@ $this->params['breadcrumbs'][] = $this->title; 'filter' => [1 => 'Case Outlab'], 'format' => 'raw', 'value' => function ($model) { - return $model->is_outlab == 1 ? 'Case Outlab' : ''; + return $model->is_outlab == 1 ? 'Case Outsource' : ''; } ], [ diff --git a/frontend/modules/pathologist/views/task/surgical.php b/frontend/modules/pathologist/views/task/surgical.php index 0f42b51d..0bd5f6a0 100755 --- a/frontend/modules/pathologist/views/task/surgical.php +++ b/frontend/modules/pathologist/views/task/surgical.php @@ -229,7 +229,7 @@ $this->params['breadcrumbs'][] = $this->title; 'filter' => [1 => 'Case Outlab'], 'format' => 'raw', 'value' => function ($model) { - return $model->is_outlab == 1 ? 'Case Outlab' : ''; + return $model->is_outlab == 1 ? 'Case Outsource' : ''; } ], [ diff --git a/frontend/themes/nikom/views/layouts/main.php b/frontend/themes/nikom/views/layouts/main.php index 0fbab066..f3e38b66 100755 --- a/frontend/themes/nikom/views/layouts/main.php +++ b/frontend/themes/nikom/views/layouts/main.php @@ -58,11 +58,11 @@ $asset = Yii::$app->assetManager->getPublishedUrl('@frontend/themes/nikom/assets } ") ?> @@ -210,7 +210,6 @@ $asset = Yii::$app->assetManager->getPublishedUrl('@frontend/themes/nikom/assets - @@ -287,27 +286,28 @@ $asset = Yii::$app->assetManager->getPublishedUrl('@frontend/themes/nikom/assets
    controller->module->id == 'admin') { ?> - -
    -
    -

    title) ?>

    -
    -
    + +
    +
    +

    title) ?>

    +
    +
    - -
    + +
    +
    -
    - - + +
    - HANUMAN PATHOLOGY LIS v202411 ผลิตในประเทศไทย © 2024 + HANUMAN PATHOLOGY LIS v202411 ผลิตในประเทศไทย © 2024 '_blank']) ?>
    @@ -341,11 +341,10 @@ $asset = Yii::$app->assetManager->getPublishedUrl('@frontend/themes/nikom/assets ] ]) ?> - registerJsFile(Yii::getAlias('@web').'/js/noti.js') ?> endBody() ?> -endPage(); \ No newline at end of file +endPage();