hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into auy-dev

Browse source
This commit is contained in:
Warunee Tamkoo 2024-02-16 11:27:03 +07:00
commit 0fe78727c1
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/release.yaml vendored
View file

@ -8,8 +8,8 @@ on:
env: env:
REGISTRY: docker.frappet.com REGISTRY: docker.frappet.com
IMAGE_NAME: ehr/bma-ehr-user IMAGE_NAME: ehr/bma-ehr-user
DEPLOY_HOST: frappet.com DEPLOY_HOST: 49.0.91.80
COMPOSE_PATH: /home/frappet/docker/bma-ehr-user COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user
jobs: jobs:
# act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
@ -60,11 +60,11 @@ jobs:
host: ${{env.DEPLOY_HOST}} host: ${{env.DEPLOY_HOST}}
username: frappet username: frappet
password: ${{ secrets.SSH_PASSWORD }} password: ${{ secrets.SSH_PASSWORD }}
port: 22 port: 10102
script: | script: |
cd "${{env.COMPOSE_PATH}}" cd "${{env.COMPOSE_PATH}}"
docker-compose pull docker compose pull
docker-compose up -d docker compose up -d
echo "${{ steps.gen_ver.outputs.image_ver }}"> success echo "${{ steps.gen_ver.outputs.image_ver }}"> success
- uses: snow-actions/line-notify@v1.1.0 - uses: snow-actions/line-notify@v1.1.0
if: success() if: success()

8
src/modules/01_dashboard/views/Dashboard.vue
View file

@ -241,7 +241,9 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
กล่องข้อความ กล่องข้อความ
</div> </div>
<q-space /> <q-space />
<div class="text-grey-5" style="font-size: 12px">ทั้งหมด {{ totalInbox }} ข้อความ</div> <div class="text-grey-5" style="font-size: 12px">
ทั้งหมด {{ totalInbox }} ข้อความ
</div>
</div> </div>
<div <div
v-if="totalInbox != 0" v-if="totalInbox != 0"
@ -265,7 +267,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
class="'q-py-md q-mb-sm my-menu'" class="'q-py-md q-mb-sm my-menu'"
:active="link === item.no" :active="link === item.no"
active-class="my-menu-link" active-class="my-menu-link"
@click="onClickOpenPopupDetail(item)" @click.stop.prevent="onClickOpenPopupDetail(item)"
> >
<q-item-section> <q-item-section>
<q-item-label caption class="text-weight-light"> <q-item-label caption class="text-weight-light">
@ -308,7 +310,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
icon="mdi-reply" icon="mdi-reply"
size="10px" size="10px"
color="grey-7" color="grey-7"
@click="dialogRepleOpen(item.no)" @click.stop.prevent="dialogRepleOpen(item.no)"
> >
<q-tooltip>ตอบกลับข้อความ</q-tooltip> <q-tooltip>ตอบกลับข้อความ</q-tooltip>
</q-btn> </q-btn>