Skip to content
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

Jump to bottom

Removed commented HTML code from frontend and appointment-frontend (CS9) #663

Merged
merged 4 commits into from
Nov 26, 2021
Merged

Removed commented HTML code from frontend and appointment-frontend (CS9) #663

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
921ccbf
Remove commented HTML code from FE and appt-FE
ChrisGabel23 Nov 18, 2021
50b0ee0
Merge branch 'master' into CodeSmells9
ChrisGabel23 Nov 18, 2021
39c36c2
Merge branch 'master' into CodeSmells9
ChrisGabel23 Nov 22, 2021
3c4495c
Merge branch 'master' into CodeSmells9
ChrisGabel23 Nov 24, 2021
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
41 changes: 0 additions & 41 deletions appointment-frontend/src/components/appointment/ServiceSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,13 @@
class="service-selection-options"
>
<div>{{ data.item.external_service_name }}</div>
<!-- <div v-if="data.item.online_link" class="service-link" :class="{'service-link-mobile': $vuetify.breakpoint.xs}" @click="goToServiceLink(data.item.external_service_name, data.item.online_link)">
Online Option <v-icon small>mdi-open-in-new</v-icon>
</div> -->
</div>
</template>
</v-combobox>
<!-- <v-btn
v-if="selectedService && selectedService.online_link"
text
link
color="primary"
target="_blank"
:href="selectedService.online_link"
>
Click here for more options
<v-icon small class="ml-1">mdi-open-in-new</v-icon>
</v-btn> -->
</v-col>
</v-row>
<!-- <v-row>-->
<!-- {{myMessage}}-->
<!-- </v-row>-->
<!-- <v-row justify="center">
<v-col cols="12" sm="6">
<v-textarea
:maxlength="maxChars"
:label=this.textCharsLeft
class="mt-3"
outlined
name="additional-options"
v-model="additionalOptions"
@change="changeAdditionalOptions"
@keyup="setCharsLeft"
></v-textarea>
</v-col>
</v-row> -->
<template v-if="selectedService && !keyPressed && !checkDisabled(selectedService)">
<div class="d-flex justify-center mb-6">
<!-- <v-btn
large
outlined
color="primary"
class="mr-3"
@click="otherBookingOptionModel = true"
>No, Book With Another Option</v-btn> -->
<v-btn
large
@click="proceedBooking"
Expand Down Expand Up @@ -195,7 +157,6 @@ export default class ServiceSelection extends Mixins(StepperMixin) {
}

private serviceSelection (value) {
// this.mylog('-> serviceSelection')
this.keyPressed = false
this.setCurrentService(value)
}
Expand All @@ -205,7 +166,6 @@ export default class ServiceSelection extends Mixins(StepperMixin) {
}

private setKeyPressed (e) {
// this.mylog('-> setKeyPressed')
if (e.key !== 'Enter') {
this.keyPressed = true
}
Expand All @@ -217,7 +177,6 @@ export default class ServiceSelection extends Mixins(StepperMixin) {
this.setCurrentService(undefined)
} else {
if (this.checkDisabled(value)) {
// this.selectedService = null
this.setCurrentService(undefined)
} else {
this.setCurrentService(value)
Expand Down
1 change: 0 additions & 1 deletion appointment-frontend/src/components/feedback/Feedback.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
</v-textarea>
<v-col class="feedback_caption response_required"><span class="mandatory">*</span> Would you like a response from us?</v-col>
<v-row justify="center">
<!-- <v-col><input type="radio" v-model="feedbackModel.responseRequired" v-bind:value="yes"><span class="feedback_caption">Yes</span></v-col> -->
<v-radio-group class="no_margin" v-model="responseRequired" row :disabled="feedbackMessage.length === 0">
<v-radio label="Yes" v-bind:value="yes"></v-radio>
<v-radio label="No" v-bind:value="no" @click="showResponsePage = false" ></v-radio>
Expand Down
19 changes: 1 addition & 18 deletions appointment-frontend/src/views/WalkinQ.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
<v-col align="center"
v-if="(showEstimate === 'True')"
justify="center">Est. time</v-col>
<!-- <v-col align="center"
justify="center">Tot. time</v-col> -->
</v-row>
<v-row v-for="(Q, index) in theWalkinQ"
:key="Q.citizen_id">
Expand All @@ -41,7 +39,6 @@
>
<span v-if="Q.flag === 'agenda_panel'">{{ getAppTime(Q) }} </span>
<span v-else>{{ index + 1 }}</span>
<!-- <span v-else>{{ Q.ticket_number }}</span> -->
</v-card-text>
</v-card>
</v-col>
Expand Down Expand Up @@ -96,9 +93,6 @@
</v-icon>
Me
</v-btn>
<!-- <v-btn text v-if="Q.flag === 'serving_app'">
<span>{{ toHHMMSS(Q.service_begin_seconds) }}</span>
</v-btn> -->
</v-card-text>
</v-card>
</v-col>
Expand Down Expand Up @@ -217,16 +211,5 @@ export default class WalkinQ extends Vue {
</script>

<style lang="scss" scoped>
// @import "@/assets/scss/theme.scss";
// .card-animation-serving {
// background-color: #C9A0DC;
// animation-name: serving_now;
// animation-duration: 1s;
// animation-iteration-count:infinite;
// }

// @keyframes serving_now {
// from {background-color: #C9A0DC;}
// to {background-color: white;}
// }
// empty block
</style>
34 changes: 0 additions & 34 deletions frontend/src/components/Appointments/appt-booking-modal/appt-booking-modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,23 +121,6 @@
<b-form-row>
<b-col cols="4">
<b-form-group class="mb-0 mt-2">
<!-- <DatePicker
v-if="allow_time_edit"
v-model="start"
:time-picker-options="{
start: '8:30',
step: '00:30',
end: '17:00',
}"
lang="en"
format="h:mm a"
autocomplete="off"
:editable="true"
placeholder="Select Time"
class="w-100"
type="time"
>
</DatePicker> -->
<label v-if="allow_time_edit" class="mb-0">Select Time</label><br />
<vue-timepicker
v-if="allow_time_edit"
Expand Down Expand Up @@ -515,14 +498,6 @@ export default class ApptBookingModal extends Vue {
}
if (this.clickedAppt) {
const event = this.clickedAppt
// let start = moment(event.start).clone()
// for (let l of [15, 30, 45, 60]) {
// let testEnd = start.clone().add(l, 'minutes')
// if (this.appointments.find(appt => moment(appt.start).isBetween(start, testEnd))) {
// break
// }
// options.push(l)
// }
const time = 60
for (let l = 15; l <= time; l += 15) {
if (!this.lengthOptions.includes(l)) {
Expand Down Expand Up @@ -759,7 +734,6 @@ export default class ApptBookingModal extends Vue {
}

show () {
// this.selectLength = 15
if (!this.selectedServiceObj) {
this.start = null
this.appt_time = null
Expand All @@ -776,7 +750,6 @@ export default class ApptBookingModal extends Vue {
if (this.apptRescheduling) {
this.$store.commit('toggleRescheduling', false)
this.setRescheduling(false)
// this.start = this.clickedTime.start.clone()
this.start = new Date(this.clickedTime.start.format())
this.app_start_date = new Date(this.clickedTime.start.format('YYYY/MM/DD'))
this.app_start_time = {
Expand Down Expand Up @@ -821,7 +794,6 @@ export default class ApptBookingModal extends Vue {
'A': this.clickedTime.start.format('A')
}
this.curr_date = new Date(this.clickedTime.start.format())
// this.start = this.clickedTime.start.clone()

this.clearAddModal()
}
Expand All @@ -838,7 +810,6 @@ export default class ApptBookingModal extends Vue {
this.citizen_name = this.clickedAppt.title
this.comments = this.clickedAppt.comments
this.contact_information = this.clickedAppt.contact_information
// this.start = this.clickedAppt.start.clone()
this.start = new Date(this.clickedAppt.start.format())
this.app_start_date = new Date(this.clickedAppt.start.format('YYYY/MM/DD'))
this.app_start_time = {
Expand All @@ -847,7 +818,6 @@ export default class ApptBookingModal extends Vue {
'A': this.clickedAppt.start.format('A')
}
this.curr_date = new Date(this.clickedAppt.start.format())
// this.length = this.clickedAppt.end.clone().diff(this.start, 'minutes')
this.online_flag = this.clickedAppt.online_flag
this.stat_flag = this.clickedAppt.stat_flag
const { service_id } = this.clickedAppt
Expand All @@ -862,7 +832,6 @@ export default class ApptBookingModal extends Vue {
this.app_start_time = null
this.curr_date = null
//todo, remove if consditon
// this.start = this.clickedTime.start.clone()
if (this.clickedTime) {
this.start = new Date(this.clickedTime.start.format())
this.app_start_date = new Date(this.clickedTime.start.format('YYYY/MM/DD'))
Expand All @@ -873,9 +842,6 @@ export default class ApptBookingModal extends Vue {
}
this.curr_date = new Date(this.clickedTime.start.format())
}
// if (this.clickedTime) {
// this.start = this.clickedTime.start.clone()
// }
}
var now = new Date();
if (this.start > now) {
Expand Down
10 changes: 0 additions & 10 deletions frontend/src/components/Layout/nav.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@
You are using Internet Explorer, and may have a degraded experience. To increase performance and access all features please use a modern browser, like
Chrome or Microsoft Edge
</b-alert>
<!-- <v-card class="m-4" max-width="100%" elevation="5"> -->
<div class="dash-button-flex-button-container pb-0 mb-3 mx-4">
<!-- SLOT FOR EACH VIEW'S BUTTON CONTROLS-->
<!-- <div class="d-flex"> -->
<div
style="width: 75px"
v-show="$route.path !== '/queue' || showTimeTrackingIcon"
Expand All @@ -50,7 +48,6 @@
</b-button>
</div>
<router-view name="buttons"></router-view>
<!-- </div> -->
<div
v-if="calendarSetup && this.$route.path === '/booking'"
style="flex-grow: 8"
Expand Down Expand Up @@ -162,7 +159,6 @@
</div>
<AddCitizen />
<ServeCitizen v-if="showServiceModal" />
<!-- </v-card> -->
</div>
</template>

Expand Down Expand Up @@ -193,7 +189,6 @@ export default class Nav extends Vue {
@State('showGAScreenModal') private showGAScreenModal!: any

@State('showAgendaScreenModal') private showAgendaScreenModal!: any
// @State('showServiceModal') private showServiceModal!: any
@State('showTimeTrackingIcon') private showTimeTrackingIcon!: any
@State('showAddModal') private showAddModal!: any
@State('user') private user!: any
Expand All @@ -210,8 +205,6 @@ export default class Nav extends Vue {

@Mutation('toggleFeedbackModal') public toggleFeedbackModal: any
@Mutation('toggleServiceModal') public toggleServiceModal: any
// TODO check this value - seems like not using
// @Mutation('toggleTrackingIcon') public toggleTrackingIcon: any
// to check service for enable
public isServiceFLowEnabled = configMap.isServiceFLowEnabled()

Expand Down Expand Up @@ -360,9 +353,6 @@ export default class Nav extends Vue {
padding: 10px;
margin: 10px;
}
/* .add-flex-grow {
flex-grow: 1;
} */
.gaScreenChecked {
padding-left: 0em;
}
Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/ServeCitizen/dash-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ limitations under the License.*/
@row-clicked="rowClicked"
class="p-0 m-0"
>
<!--id="client-waiting-table"-->
<template #cell(counter_id)="row">{{ showCounter(row.item.counter_id) }}</template>
<template #cell(start_time)="row">{{ formatTime(row.item.start_time) }}</template>
<template #cell(csr)="row">{{ showCSR(row.item.citizen_id) }}</template>
Expand Down
10 changes: 1 addition & 9 deletions frontend/src/components/exams/return-exam-form-modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@
@click="showFieldErrors = false"
>Submit</b-btn
>
<!-- This is the old button. Leaving it commented in case a rollback is needed. -->
<!-- <b-btn
v-if="!okButton.disabled"
:class="okButton.title === 'Cancel' ? 'btn-secondary' : 'btn-primary'"
@click.prevent="submit"
>{{ okButton.title }}</b-btn
> -->
<b-btn
v-if="!okButton.disabled"
:class="okButton.title === 'Cancel' ? 'btn-secondary' : 'btn-primary'"
Expand Down Expand Up @@ -377,8 +370,7 @@ export default class ReturnExamModal extends Vue {
this.resetModal()
})
}).catch(() => {
// JSTOTS This property not existing. now just commenting out. check
// this.setExamEditFailureMessage(10)
// empty block
})
}
}
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/components/exams/upload-pesticide-exam.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<b-btn class="btn-secondary mr-2" @click="resetModal">{{
submitted ? 'Done' : 'Cancel'
}}</b-btn>
<!-- This is the old button. Leaving it commented in case a rollback is needed. -->
<!-- <b-btn class="btn-primary" v-if="!submitted" @click.once="submit"
>Submit</b-btn
> -->
<b-btn class="btn-primary" v-if="!submitted" @click="examStatus"
>Submit</b-btn
>
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/upload/existingfiles.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
fixed
bordered
>
<!--style="text-align: center">-->

<!-- This is the file name -->
<template #cell(name)="row">
Expand Down Expand Up @@ -90,7 +89,6 @@ export default class ExistingFiles extends Vue {

</script>

<!--<style scoped>-->
<style>
.existing_files_table {
padding: 0px;
Expand Down