Skip to content

Merging updates from main into clinician-filters #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swaminathanR04 merged 7 commits into from
Apr 28, 2026
Merged

Merging updates from main into clinician-filters #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
741eae1
build problems
Deethya0715 Apr 23, 2026
a441bbf
Merge pull request #53 from UTDallasEPICS/clinician-filters
swaminathanR04 Apr 26, 2026
60aa503
Merge pull request #54 from UTDallasEPICS/stage
swaminathanR04 Apr 26, 2026
d8e6235
Merge branch 'stage' of https://github.com/UTDallasEPICS/hch into stage
Deethya0715 Apr 26, 2026
40e6a41
updated workflow files: using variables and refreshing tasks
TusharW4ni Apr 26, 2026
deec38f
Merge branch 'main' of https://github.com/UTDallasEPICS/hch
TusharW4ni Apr 26, 2026
541f728
Merge branch 'main' into stage
TusharW4ni Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: configure aws credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::654654236858:role/GithubActions
role-to-assume: ${{ secrets.ACTIONS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
aws-region: us-east-2

Expand All @@ -31,10 +31,14 @@ jobs:

- name: Build and Push Docker image
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry}}
REPOSITORY: hch
IMAGE_TAG: ${{ github.sha}}
DATABASE_URL: 'file:./dev.db'
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
REPOSITORY: ${{ vars.REPOSITORY }}
IMAGE_TAG: ${{ github.sha }}
DATABASE_URL: "file:./dev.db"
CLUSTER_NAME: ${{ secrets.CLUSTER_NAME }}
SERVICE_NAME: ${{ vars.REPOSITORY }}-prod-service
run: |
docker build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:$IMAGE_TAG .
docker build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:prod .
aws ecs update-service --cluster $CLUSTER_NAME --service $SERVICE_NAME --force-new-deployment --output text --query "service.serviceName" >/dev/null
echo "The container will update now"
14 changes: 9 additions & 5 deletions .github/workflows/stage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: configure aws credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::654654236858:role/GithubActions
role-to-assume: ${{ secrets.ACTIONS_ROLE_ARN }}
role-session-name: GitHub_to_AWS_via_FederatedOIDC
aws-region: us-east-2

Expand All @@ -31,10 +31,14 @@ jobs:

- name: Build and Push Docker image
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry}}
REPOSITORY: hch
IMAGE_TAG: ${{ github.sha}}
DATABASE_URL: 'file:./dev.db'
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
REPOSITORY: ${{ vars.REPOSITORY }}
IMAGE_TAG: ${{ github.sha }}
DATABASE_URL: "file:./dev.db"
CLUSTER_NAME: ${{ secrets.CLUSTER_NAME }}
SERVICE_NAME: ${{ vars.REPOSITORY }}-stage-service
run: |
docker build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:$IMAGE_TAG .
docker build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:stage .
aws ecs update-service --cluster $CLUSTER_NAME --service $SERVICE_NAME --force-new-deployment --output text --query "service.serviceName" >/dev/null
echo "The container will update now"
24 changes: 20 additions & 4 deletions app/pages/calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,30 @@
Session name will be auto-generated as <strong>Firstname_Lastname_##</strong>.
</p>

<UTextarea v-model="form.description" placeholder="Description" />
<div>
<label class="mb-2 block text-sm font-medium" for="create-description">Description</label>
<UTextarea
id="create-description"
v-model="form.description"
placeholder="Optional notes for this session"
/>
</div>

<div class="grid grid-cols-3 gap-4">
<UInput v-model="form.date" type="date" />
<div>
<label class="mb-2 block text-sm font-medium" for="create-date">Date</label>
<UInput id="create-date" v-model="form.date" type="date" />
</div>

<UInput v-model="form.startTime" type="time" />
<div>
<label class="mb-2 block text-sm font-medium" for="create-start-time">Start Time</label>
<UInput id="create-start-time" v-model="form.startTime" type="time" />
</div>

<UInput v-model="form.endTime" type="time" />
<div>
<label class="mb-2 block text-sm font-medium" for="create-end-time">End Time</label>
<UInput id="create-end-time" v-model="form.endTime" type="time" />
</div>
</div>
<p v-if="createTimeRangeError" class="text-sm text-red-500">
{{ createTimeRangeError }}
Expand Down
Loading
Loading