Skip to content

feat(event): remove covid workflow #2328

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
WikiRik merged 4 commits into from
Mar 22, 2025
Merged

feat(event): remove covid workflow #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
579409d
fix(su): sort the list of SUs on status change page by default on date
LeonVreling Mar 17, 2025
de7b683
feat(event): remove covid workflow
LeonVreling Mar 18, 2025
67a6f16
Merge branch 'stable' into su-updates
LeonVreling Mar 18, 2025
e0af79a
Merge branch 'stable' into su-updates
WikiRik Mar 22, 2025
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
34 changes: 1 addition & 33 deletions src/views/summeruniversity/Apply.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,42 +292,10 @@

<div class="field">
<label class="has-text-weight-bold">
SU Covid regulations <span class="has-text-danger">*</span>
SU specific regulations <span class="has-text-danger">*</span>
</label>
<div class="control">
<b-checkbox required v-model="application.agreed_to_su_terms">
I declare that, I will NOT travel, pursuant to the regulation in force,
if at the time of travel: I am affected by Covid-19 or subjected to a
mandatory quarantine period of at least 14 days; I am suffering from a
fever with a temperature above 37,5°C; I have a persistent cough,
difficulty breathing, cold, sore throat, headache, severe weakness
(tiredness), decrease or loss of smell/taste, diarrhoea; I have had
close contact with a person affected by Covid-19 between 2 days before
the occurrence of symptoms and up to 14 days after the occurrence of
symptoms. I also undertake to inform the local organisers and Local
Health Authority of any possible occurrence of above mentioned symptoms
arising within eight days after the conclusion of the event.<br />
Failure to present any mandatory documentation may result in my
participation in the event being denied by local authorities and/or
the local organisers and my entry being denied in the destination country.<br />
I declare that I will indemnify any local of AEGEE against any and all
fines and/or costs the local may incur due to my failure to comply with
any of the above Covid-19 government requirements.<br />
I confirm that I will comply with all country specific Covid-19 requirements
and the documents provided are valid and as required for travel. I understand
that I am required to have these documents available (digitally or in paper
format) for inspection by local authorities.
</b-checkbox>
</div>
<p class="help is-danger" v-if="errors.agreed_to_su_terms">{{ errors.agreed_to_su_terms.join(', ') }}</p>
</div>

<div class="field">
<label class="has-text-weight-bold">
SU specific Covid regulations <span class="has-text-danger">*</span>
</label>
<div class="control">
<b-checkbox required>
I confirm that I have read and understood the regulations set up by the local organisers.
</b-checkbox>
</div>
Expand Down
33 changes: 2 additions & 31 deletions src/views/summeruniversity/ChangeStatus.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

<b-table
:data="events"
:loading="isLoading">
:loading="isLoading"
:default-sort="['starts', 'desc']">
<b-table-column field="type" label="Event type" sortable v-slot="props">
{{ eventTypes[props.row.type] }}
</b-table-column>
Expand Down Expand Up @@ -65,18 +66,6 @@
@click="changeStatus(props.row, 'second submission')">
Submit second draft
</button>
<button
v-if="props.row.status === 'second approval'"
class="button is-small is-warning"
@click="changeStatus(props.row, 'covid submission')">
Submit covid draft
</button>
<button
v-if="props.row.status === 'covid draft'"
class="button is-small is-warning"
@click="changeStatus(props.row, 'covid submission')">
Submit covid draft
</button>
<button
v-if="props.row.status === 'first submission'"
class="button is-small is-primary"
Expand All @@ -89,12 +78,6 @@
@click="changeStatus(props.row, 'second approval')">
Approve second submission
</button>
<button
v-if="props.row.status === 'covid submission'"
class="button is-small is-primary"
@click="changeStatus(props.row, 'covid approval')">
Approve covid submission
</button>
<button
v-if="props.row.status === 'first submission'"
class="button is-small is-danger"
Expand All @@ -107,12 +90,6 @@
@click="changeStatus(props.row, 'second draft')">
Reject second submission
</button>
<button
v-if="props.row.status === 'covid submission'"
class="button is-small is-danger"
@click="changeStatus(props.row, 'covid draft')">
Reject covid submission
</button>
</div>
</b-table-column>

Expand All @@ -130,12 +107,6 @@
@click="changePublication(props.row, 'full')">
Publish full event
</button>
<button
v-if="props.row.published === 'full'"
class="button is-small is-info"
@click="changePublication(props.row, 'covid')">
Publish covid event
</button>
<button
v-if="props.row.published !== 'none'"
class="button is-small is-danger"
Expand Down
27 changes: 9 additions & 18 deletions src/views/summeruniversity/Edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<tbody>
<tr v-for="(learning_objective, index) in event.learning_objectives" v-bind:key="index">
<td>
<input class="input" type="text" required v-model="event.learning_objectives[index].description" />
<input class="input" type="text" required v-model="learning_objective.description" />
</td>
<td>
<a class="button is-danger" @click="deleteLearningObjective(index)">Delete</a>
Expand Down Expand Up @@ -316,9 +316,9 @@
<label class="label">Social media <URLTooltip /></label>
<table class="table is-narrowed">
<tbody>
<tr v-for="(social_media, index) in event.social_media" v-bind:key="index">
<tr v-for="(social_medium, index) in event.social_media" v-bind:key="index">
<td>
<input class="input" type="url" required v-model="event.social_media[index].description" />
<input class="input" type="url" required v-model="social_medium.description" />
</td>
<td>
<a class="button is-danger" @click="deleteSocialMedia(index)">Delete</a>
Expand Down Expand Up @@ -354,9 +354,9 @@
<label class="label">Photos <URLTooltip /></label>
<table class="table is-narrowed">
<tbody>
<tr v-for="(photos, index) in event.photos" v-bind:key="index">
<tr v-for="(photo, index) in event.photos" v-bind:key="index">
<td>
<input class="input" type="url" required v-model="event.photos[index].description" />
<input class="input" type="url" required v-model="photo.description" />
</td>
<td>
<a class="button is-danger" @click="deletePhotos(index)">Delete</a>
Expand Down Expand Up @@ -568,7 +568,7 @@
<tr>
<th>Latitude</th>
<th>Longitude</th>
<th>Name</th>
<th>Name <span class="has-text-danger">*</span></th>
<th>Description</th>
<th>Starting city</th>
<th>Ending city</th>
Expand Down Expand Up @@ -647,9 +647,9 @@
<div class="field">
<table class="table is-narrowed">
<tbody>
<tr v-for="(questions, index) in event.questions" v-bind:key="index">
<tr v-for="(question, index) in event.questions" v-bind:key="index">
<td>
<input class="input" type="text" required v-model="event.questions[index].description" />
<input class="input" type="text" required v-model="question.description" />
</td>
<td>
<a class="button is-danger" @click="deleteQuestion(index)">Delete</a>
Expand All @@ -674,17 +674,9 @@
</div>
<p class="help is-danger" v-if="errors.questions">{{ errors.questions.message }}</p>

<div class="subtitle is-fullwidth has-text-centered">Covid regulations</div>
<div class="subtitle is-fullwidth has-text-centered">Regulations</div>
<hr />

<div class="field">
<label class="label">Where to find covid regulations <span class="has-text-danger">*</span></label>
<div class="control">
<textarea class="textarea" placeholder="Where to find information on destinations' covid regulations." required v-model="event.covid_regulations" />
</div>
<p class="help is-danger" v-if="errors.covid_regulations">{{ errors.covid_regulations.join(', ') }}</p>
</div>

<div class="field">
<label class="label">Payment and cancellation rules <span class="has-text-danger">*</span></label>
<div class="control">
Expand Down Expand Up @@ -830,7 +822,6 @@ export default {
pax_confirmation: null,
pax_description: null,
special_equipment: null,
covid_regulations: null,
cancellation_rules: null,
additional_regulation: null,
agreed_to_su_terms: false
Expand Down
12 changes: 6 additions & 6 deletions src/views/summeruniversity/EditSecond.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@
<label class="label">Social media <URLTooltip /></label>
<table class="table is-narrowed">
<tbody>
<tr v-for="(social_media, index) in event.social_media" v-bind:key="index">
<tr v-for="(social_medium, index) in event.social_media" v-bind:key="index">
<td>
<input class="input" type="url" required v-model="event.social_media[index].description" />
<input class="input" type="url" required v-model="social_medium.description" />
</td>
<td>
<a class="button is-danger" @click="deleteSocialMedia(index)">Delete</a>
Expand Down Expand Up @@ -164,9 +164,9 @@
<label class="label">Photos <span class="has-text-danger">*</span> <URLTooltip /></label>
<table class="table is-narrowed">
<tbody>
<tr v-for="(photos, index) in event.photos" v-bind:key="index">
<tr v-for="(photo, index) in event.photos" v-bind:key="index">
<td>
<input class="input" type="url" required v-model="event.photos[index].description" />
<input class="input" type="url" required v-model="photo.description" />
</td>
<td>
<a class="button is-danger" @click="deletePhotos(index)">Delete</a>
Expand Down Expand Up @@ -384,9 +384,9 @@
<div class="field">
<table class="table is-narrowed">
<tbody>
<tr v-for="(questions, index) in event.questions" v-bind:key="index">
<tr v-for="(question, index) in event.questions" v-bind:key="index">
<td>
<input class="input" type="text" required v-model="event.questions[index].description" />
<input class="input" type="text" required v-model="question.description" />
</td>
<td>
<a class="button is-danger" @click="deleteQuestion(index)">Delete</a>
Expand Down
1 change: 0 additions & 1 deletion src/views/summeruniversity/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<p>On this page you will find the list of all Summer Universities that are most probably going to happen this summer. There are some however which are not open yet to applications,
these SUs will open soon, once they have all information ready. In case you cannot find a SU anymore, it means they sadly had to cancel organizing it.</p>
<p>To apply to a Summer University you will need to be a member of a local and login on MyAEGEE. You will be able to apply only to <strong>ONE</strong> SU at the same time.</p>
<p>Make sure you read the information of each SU carefully before applying, as there is crucial information in regards to COVID-19.</p>
<p>We hope you will apply to an amazing adventure this summer!</p>
</div>
</div>
Expand Down
49 changes: 1 addition & 48 deletions src/views/summeruniversity/Single.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,6 @@
</a>
</div>

<!-- For SUCT: submit covid draft (covid draft -> covid submission) -->
<div class="field is-grouped" v-if="can.change_status.covid_submission && event.status === 'covid draft'">
<a class="button is-fullwidth is-warning" @click="askChangeStatus('covid submission')">
<span>Submit covid draft</span>
<span class="icon"><font-awesome-icon icon="sign-in-alt" /></span>
</a>
</div>

<!-- For SUCT & LOs: submit first approval (first approval -> second submission) -->
<div class="field is-grouped" v-if="can.change_status.second_submission && event.status === 'first approval'">
<a class="button is-fullwidth is-warning" @click="askChangeStatus('second submission')">
Expand All @@ -107,14 +99,6 @@
</a>
</div>

<!-- For SUCT & LOs: submit second approval (second approval -> covid submission) -->
<div class="field is-grouped" v-if="can.change_status.covid_submission && event.status === 'second approval'">
<a class="button is-fullwidth is-warning" @click="askChangeStatus('covid submission')">
<span>Submit event for covid approval</span>
<span class="icon"><font-awesome-icon icon="sign-in-alt" /></span>
</a>
</div>

<!-- For SUCT: approve first submission (first submission -> first approval) -->
<div class="field is-grouped" v-if="can.change_status.first_approval && event.status === 'first submission'">
<a class="button is-fullwidth is-primary" @click="askChangeStatus('first approval')">
Expand All @@ -131,14 +115,6 @@
</a>
</div>

<!-- For SUCT: approve covid submission (covid submission -> covid approval) -->
<div class="field is-grouped" v-if="can.change_status.covid_approval && event.status === 'covid submission'">
<a class="button is-fullwidth is-primary" @click="askChangeStatus('covid approval')">
<span>Approve covid submission</span>
<span class="icon"><font-awesome-icon icon="check" /></span>
</a>
</div>

<!-- For SUCT: reject first submission (first submission -> first draft) -->
<div class="field is-grouped" v-if="can.change_status.first_draft && event.status === 'first submission'">
<a class="button is-fullwidth is-danger" @click="askChangeStatus('first draft')">
Expand All @@ -155,14 +131,6 @@
</a>
</div>

<!-- For SUCT: reject covid submission (covid submission -> covid draft) -->
<div class="field is-grouped" v-if="can.change_status.covid_draft && event.status === 'covid submission'">
<a class="button is-fullwidth is-danger" @click="askChangeStatus('covid draft')">
<span>Reject covid submission</span>
<span class="icon"><font-awesome-icon icon="times-circle" /></span>
</a>
</div>

<!-- For SUCT: publish minimal event -->
<div class="field is-grouped" v-if="can.manage_summeruniversity[event.type] && event.published === 'none'">
<a class="button is-fullwidth is-info" @click="askChangePublication('minimal')">
Expand All @@ -179,14 +147,6 @@
</a>
</div>

<!-- For SUCT: publish covid event -->
<div class="field is-grouped" v-if="can.manage_summeruniversity[event.type] && event.published === 'full'">
<a class="button is-fullwidth is-info" @click="askChangePublication('covid')">
<span>Publish covid event</span>
<span class="icon"><font-awesome-icon icon="globe" /></span>
</a>
</div>

<!-- For SUCT: unpublish event -->
<div class="field is-grouped" v-if="can.manage_summeruniversity[event.type] && event.published !== 'none'">
<a class="button is-fullwidth is-danger" @click="askChangePublication('none')">
Expand Down Expand Up @@ -317,10 +277,6 @@
<th>Has university support?</th>
<td>{{ event.university_support | beautify }}</td>
</tr>
<tr v-if="event.covid_regulations">
<th>Where to find covid regulations</th>
<td>{{ event.covid_regulations }}</td>
</tr>
<tr v-if="event.cancellation_rules">
<th>Payment and cancellation rules</th>
<td>{{ event.cancellation_rules }}</td>
Expand Down Expand Up @@ -484,10 +440,7 @@ export default {
first_approval: false,
second_draft: false,
second_submission: false,
second_approval: false,
covid_draft: false,
covid_submission: false,
covid_approval: false
second_approval: false
}
}
}
Expand Down