Merge branch 'staging.hisworklist' into 'master'

Staging.hisworklist

See merge request !5

.gitlab-ci.yml

@@ -40,7 +40,7 @@ build_in_staging:
     - $env:TAG_VERSION=(git describe --tag --abbrev=0)
     - $env:BRANCHFULLNAME=(git name-rev --name-only HEAD)
     - $env:BRANCHNAME=$env:BRANCHFULLNAME.Split('/')[$env:BRANCHFULLNAME.Split('/').length - 1]
-    - $env:CONTAINERNAME=$env:BRANCHNAME.Split('_')[1]
+    - $env:CONTAINERNAME=$env:BRANCHNAME.Split('.')[1]
     - docker login -u reza.s -p aA123456 repo.marcopacs.com
   stage: build_in_staging
   tags:
@@ -69,11 +69,11 @@ build_in_staging:
     - Set-Variable -Name "envtext1" -Value "CONTAINERNAME=$env:CONTAINERNAME"
     - Add-Content .\.env "$envtext1"
     - echo y | pscp.exe -batch -l administrator -pw $env:StagingPass  ./.env  staging.karname.ir:c:/Users/administrator/.env # save .env in remote server 
+    - Set-Variable -Name "batchtext" -Value "cd c:/Users/administrator&&docker-compose config&&docker-compose pull app&&docker-compose -p $env:CONTAINERNAME up -d --force-recreate"
+    - Add-Content .\command.bat "$batchtext"
     - echo y | plink -batch -ssh administrator@staging.karname.ir -pw $env:StagingPass -m ./command.bat
     # - ./scripts/command.ps1
   allow_failure: true
-  # only:
-  #   - devel-windows
   only:
     - /^.*staging.*/
 
@@ -90,8 +90,6 @@ build_in_master:
   allow_failure: true
   only:
     - tags
-  except:
-    - /^(?!master).+@/
 
 # on_build_failure:
 #   stage: cleanup_build

client/views/Main.vue

@@ -29,6 +29,7 @@
         
         <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
         <v-toolbar-title class="red--text">Karname</v-toolbar-title>
+        <router-view name="register_patient"></router-view>
         <v-spacer></v-spacer>
         
       </v-app-bar>

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   app:
-    container_name: ${CONTAINERNAME} #karname-app
+    # container_name: ${CONTAINERNAME} #karname-app
     restart: always
     image: repo.marcopacs.com/karname/karname-app:${TAG_VERSION} #"karname-app:${TAG_VERSION}"
     # ports:

scripts/command-server.bat

-del /f /Q C:\Users\Administrator\setup-x86_64.exe
+cd c:/Users/administrator && docker-compose config && docker-compose -p %1 up -d --force-recreate 
\ No newline at end of file

scripts/command.bat

-cd c:/Users/administrator && docker-compose config && docker-compose up -d --force-recreate 
\ No newline at end of file