Skip to content

Commit

Permalink
Change 'slot/slot-scope' to 'v-slot:cell()'
Browse files Browse the repository at this point in the history
  • Loading branch information
@LocalNewsTV
LocalNewsTV committed Nov 23, 2023
1 parent 752cc0f commit 20a9ade
Show file tree
Hide file tree
Showing 15 changed files with 95 additions and 95 deletions.
6 changes: 3 additions & 3 deletions app/frontend/src/aquifers/components/Search.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@
v-if="searchPerformed"
:tbody-tr-class="searchResultsRowClass"
responsive>
<template slot="id" slot-scope="row">
<template v-slot:cell(id)="row">
<router-link :to="{ name: 'aquifers-view', params: {id: row.item.aquifer_id} }">{{ row.item.aquifer_id }}</router-link>
</template>
<template slot="name" slot-scope="row">
<template v-slot:cell(name)="row">
{{row.item.name}}
</template>
<template slot="retire_date" slot-scope="row">
<template v-slot:cell(retire_date)="row">
<span :title="row.item.retire_date">{{ row.item.retire_date | moment("MMMM Do YYYY [at] LT") }}</span>
</template>
<template v-slot:table-busy>
Expand Down
4 changes: 2 additions & 2 deletions app/frontend/src/aquifers/components/View.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,12 @@
</b-row>
</div>
<b-table id="licenses" striped :items="licenceDetails.wells_by_licence">
<template slot="licence_number" slot-scope="row">
<template v-slot:cell(license_number)="row">
<a :href="`https://j200.gov.bc.ca/pub/ams/Default.aspx?PossePresentation=AMSPublic&amp;PosseObjectDef=o_ATIS_DocumentSearch&amp;PosseMenuName=WS_Main&Criteria_LicenceNumber=${row.item.licence_number}`" target="_blank">
{{ row.item.licence_number }}
</a>
</template>
<template slot="well_tag_numbers_in_licence" slot-scope="row">
<template v-slot:cell(well_tag_numbers_in_license)="row">
<ul class="p-0 m-0">
<li v-for="wtn in row.item.well_tag_numbers_in_licence" :key="wtn">
<router-link :to="{ name: 'wells-detail', params: { id: wtn }}">{{ wtn }}</router-link>
Expand Down
8 changes: 4 additions & 4 deletions app/frontend/src/bulk/components/BulkAquiferDocuments.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@
<template slot="no-options">
Search for an aquifer by name or id number
</template>
<template slot="option" slot-scope="option">
<template v-slot:cell(option)="option">
<div>{{ option.description }}</div>
</template>
<template slot="selected-option" slot-scope="option">
<template v-slot:cell(selected-option)="option">
<div>{{ option.description }}</div>
</template>
</v-select>
Expand All @@ -205,12 +205,12 @@
:show-empty="aquiferTableData.length === 0"
empty-text="No documents with keyed aquifer IDs"
striped>
<template slot="aquiferId" slot-scope="row">
<template v-slot:cell(aquiferId)="row">
<span :class="{ unknown: checkAquiferIsUnknown(row.item.aquiferId) }">
{{row.item.aquiferId}}
</span>
</template>
<template slot="documents" slot-scope="row">
<template v-slot:cell(documents)="option">
<ul>
<li v-for="(file, index) in row.item.documents" :key="index">
{{ fileNameWithoutPrefix(file.name) }}
Expand Down
10 changes: 5 additions & 5 deletions app/frontend/src/bulk/components/BulkVerticalAquiferExtents.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@
hover
:items="errorsTableData"
:fields="errorTableFields">
<template slot="wellTagNumber" slot-scope="row">
<template v-slot:cell(wellTagNumber)="row">
<span :class="{ error: isUnknownWell(row.item.wellTagNumber) }">
{{row.item.wellTagNumber}}
</span>
</template>
<template slot="aquiferId" slot-scope="row">
<template v-slot:cell(aquiferId)="row">
<span :class="{ error: isUnknownAquifer(row.item.aquiferId) }">
{{row.item.aquiferId}}
</span>
Expand All @@ -153,15 +153,15 @@
hover
:items="tableData"
:fields="tableFields">
<template slot="wellTagNumber" slot-scope="row">
<template v-slot:cell(wellTagNumber)="row">
<router-link :to="{ name: 'well-aquifers', params: {wellTagNumber: row.item.wellTagNumber} }" target="_blank">
{{row.item.wellTagNumber}}
</router-link>
</template>
<template slot="fromDepth" slot-scope="row">
<template v-slot:cell(fromDepth)="row">
{{row.item.fromDepth.toFixed(2)}}
</template>
<template slot="toDepth" slot-scope="row">
<template v-slot:cell(toDepth)="row">
{{row.item.toDepth === null ? '\u2014' : row.item.toDepth.toFixed(2)}}
</template>
</b-table>
Expand Down
8 changes: 4 additions & 4 deletions app/frontend/src/bulk/components/BulkWellAquiferCorrelation.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@
hover
:items="errorsTableData"
:fields="errorTableFields">
<template slot="aquiferId" slot-scope="row">
<template v-slot:cell(aquiferId)="row">
<span :class="{ error: isUnknownAquifer(row.item.aquiferId) }">
{{row.item.aquiferId}}
</span>
</template>
<template slot="wellTagNumber" slot-scope="row">
<template v-slot:cell(wellTagNumber)="row">
<span :class="{ error: isUnknownWell(row.item.wellTagNumber) }">
{{row.item.wellTagNumber}}
</span>
Expand Down Expand Up @@ -133,12 +133,12 @@
hover
:items="tableData"
:fields="tableFields">
<template slot="oldAquiferId" slot-scope="row">
<template v-slot:cell(oldAquiferId)="row">
<span>
{{formatOldAquifer(row)}}
</span>
</template>
<template slot="warnings" slot-scope="row">
<template v-slot:cell(warnings)="row">
<ul v-if="row.item.warnings.length > 0">
<li v-for="(warning, index) in row.item.warnings" :key="index">
{{ warning }}
Expand Down
4 changes: 2 additions & 2 deletions app/frontend/src/bulk/components/BulkWellDocuments.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@
:show-empty="wellTableData.length === 0"
empty-text="No documents with well tag numbers"
striped>
<template slot="wellTagNumber" slot-scope="row">
<template v-slot:cell(wellTagNumber)="row">
<span :class="{ unknown: checkWellIsUnknown(row.item.wellTagNumber) }">
{{row.item.wellTagNumber}}
</span>
<b-spinner v-if="fetchWellFilesInProgress[row.item.wellTagNumber]" small/>
</template>
<template slot="documents" slot-scope="row">
<template v-slot:cell(documents)="row">
<ul>
<li v-for="(doc, index) in row.item.documents" :key="index" :class="{overwrite: doc.exists}">
{{ doc.name }}
Expand Down
4 changes: 2 additions & 2 deletions app/frontend/src/submissions/components/SubmissionForm/AquiferData.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ Licensed under the Apache License, Version 2.0 (the "License");
<template slot="no-options">
Search for an aquifer by name or id number
</template>
<template slot="option" slot-scope="option">
<template v-slot:cell(option)="option">
<div>
{{ option.description }}
</div>
</template>
<template slot="selected-option" slot-scope="option">
<template v-slot:cell(selected-option)="option">
<div>
{{ option.description }}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/frontend/src/submissions/components/SubmissionForm/PersonResponsible.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ Licensed under the Apache License, Version 2.0 (the "License");
<template slot="no-options">
Type to search registry...
</template>
<template slot="selected-option" slot-scope="option">
<template v-slot:cell(selected-option)="option">
<div>
{{ personNameReg (option) }}
</div>
</template>
<template slot="option" slot-scope="option">
<template v-slot:cell(option)="option">
<div>
{{ personNameReg (option) }}
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/frontend/src/submissions/components/SubmissionForm/SubmissionHistory.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ Licensed under the Apache License, Version 2.0 (the "License");
:per-page="submissionsPerPage"
:current-page="submissionsPage"
>
<template slot="report" slot-scope="data">
<template v-slot:cell(report)="data">
<div>
<router-link :to="{ name: 'SubmissionDetail', params: { id: $route.params.id, submissionId: data.item.filing_number }}">{{ data.item.well_activity_description }}</router-link>
</div>
</template>
<template slot="date_entered" slot-scope="data">
<template v-slot:cell(date_entered)="data">
<div>
<span v-if="data.item.create_date">{{ data.item.create_date | moment("MMMM Do YYYY [at] LT") }}</span>
</div>
</template>
<template slot="entered_by" slot-scope="data">
<template v-slot:cell(entered_by)="data">
<div>
{{ data.item.create_user }}
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/frontend/src/submissions/components/SubmissionForm/VerticalAquiferExtents.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ Licensed under the Apache License, Version 2.0 (the "License");
:items="tableData"
show-empty
empty-text="There are currently no vertical aquifer extents for this well.">
<template slot="start" slot-scope="data">{{parseFloat(data.item.start).toFixed(2)}} m</template>
<template slot="end" slot-scope="data">{{parseFloat(data.item.end).toFixed(2)}} m</template>
<template slot="height" slot-scope="data">{{data.item.height.toFixed(2)}} m</template>
<template v-slot:cell(start)="data">{{parseFloat(data.item.start).toFixed(2)}} m</template>
<template v-slot:cell(end)="data">{{parseFloat(data.item.end).toFixed(2)}} m</template>
<template v-slot:cell(height)="data">{{data.item.height.toFixed(2)}} m</template>
</b-table>

<div>
Expand Down
4 changes: 2 additions & 2 deletions app/frontend/src/submissions/components/SubmissionForm/WellType.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ Licensed under the Apache License, Version 2.0 (the "License");
<template slot="no-options">
Search by well tag number or owner name
</template>
<template slot="option" slot-scope="option">
<template v-slot:cell(option)="option">
<div>
{{ option.well_tag_number }} ({{ option.owner_full_name }})
</div>
</template>
<template slot="selected-option" slot-scope="option">
<template v-slot:cell(selected-option)="option">
<div>
{{ option.well_tag_number }}
</div>
Expand Down
50 changes: 25 additions & 25 deletions app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@ Licensed under the Apache License, Version 2.0 (the "License");
'water_bearing_estimated_flow',
'observations'
]">
<template slot="description" slot-scope="data">{{data.item.lithology_raw_data}}</template>
<template slot="from" slot-scope="data">{{data.item.start}}</template>
<template slot="to" slot-scope="data">{{data.item.end}}</template>
<template slot="colour" slot-scope="data">{{codeToDescription('lithology_colours', data.item.lithology_colour) }}</template>
<template slot="hardness" slot-scope="data">{{codeToDescription('lithology_hardness_codes', data.item.lithology_hardness) }}</template>
<template slot="moisture" slot-scope="data">{{codeToDescription('lithology_moisture_codes', data.item.lithology_moisture) }}</template>
<template slot="descriptor" slot-scope="data">{{codeToDescription('lithology_descriptors', data.item.lithology_description) }}</template>
<template slot="observations" slot-scope="data">{{ data.item.lithology_observation }}</template>
<template v-slot:cell(description)="data">{{data.item.lithology_raw_data}}</template>
<template v-slot:cell(from)="data">{{data.item.start}}</template>
<template v-slot:cell(to)="data">{{data.item.end}}</template>
<template v-slot:cell(colour)="data">{{codeToDescription('lithology_colours', data.item.lithology_colour) }}</template>
<template v-slot:cell(hardness)="data">{{codeToDescription('lithology_hardness_codes', data.item.lithology_hardness) }}</template>
<template v-slot:cell(moisture)="data">{{codeToDescription('lithology_moisture_codes', data.item.lithology_moisture) }}</template>
<template v-slot:cell(descriptor)="data">{{codeToDescription('lithology_descriptors', data.item.lithology_description) }}</template>
<template v-slot:cell(observations)="data">{{ data.item.lithology_observation }}</template>
</b-table>
</div>
</fieldset>
Expand All @@ -216,10 +216,10 @@ Licensed under the Apache License, Version 2.0 (the "License");
:fields="['start', 'end', 'material', 'observations']"
show-empty
>
<template slot="start" slot-scope="data">{{data.item.start}} ft</template>
<template slot="end" slot-scope="data">{{data.item.end}} ft</template>
<template slot="material" slot-scope="data">{{codeToDescription('decommission_materials', data.item.material)}}</template>
<template slot="observations" slot-scope="data">{{codeToDescription('decommission_materials', data.item.observations)}}</template>
<template v-slot:cell(start)="data">{{data.item.start}} ft</template>
<template v-slot:cell(end)="data">{{data.item.end}} ft</template>
<template v-slot:cell(material)="data">{{codeToDescription('decommission_materials', data.item.material)}}</template>
<template v-slot:cell(observations)="data">{{codeToDescription('decommission_materials', data.item.observations)}}</template>
</b-table>
</div>
</fieldset>
Expand All @@ -235,11 +235,11 @@ Licensed under the Apache License, Version 2.0 (the "License");
:fields="['from', 'to', 'casing_type', 'casing_material', 'diameter', 'wall_thickness', 'drive_shoe_status']"
show-empty>

<template slot="from" slot-scope="data">{{data.item.start}}{{data.item.start ? ' ft' : '' }}</template>
<template slot="to" slot-scope="data">{{data.item.end}}{{data.item.end ? ' ft' : '' }}</template>
<template slot="casing_type" slot-scope="data">{{codeToDescription('casing_codes', data.item.casing_code)}}</template>
<template slot="casing_material" slot-scope="data">{{codeToDescription('casing_materials', data.item.casing_material)}}</template>
<template slot="drive_shoe_status" slot-scope="data">{{codeToDescription('drive_shoe_status', data.item.drive_shoe_status)}}</template>
<template v-slot:cell(from)="data">{{data.item.start}}{{data.item.start ? ' ft' : '' }}</template>
<template v-slot:cell(to)="data">{{data.item.end}}{{data.item.end ? ' ft' : '' }}</template>
<template v-slot:cell(casing_type)="data">{{codeToDescription('casing_codes', data.item.casing_code)}}</template>
<template v-slot:cell(casing_material)="data">{{codeToDescription('casing_materials', data.item.casing_material)}}</template>
<template v-slot:cell(drive_shoe_status)="data">{{codeToDescription('drive_shoe_status', data.item.drive_shoe_status)}}</template>

</b-table>
</div>
Expand Down Expand Up @@ -289,8 +289,8 @@ Licensed under the Apache License, Version 2.0 (the "License");
:fields="['from', 'to']"
show-empty
>
<template slot="from" slot-scope="data">{{data.item.start}} ft</template>
<template slot="to" slot-scope="data">{{data.item.end}} ft</template>
<template v-slot:cell(from)="data">{{data.item.start}} ft</template>
<template v-slot:cell(to)="data" >{{data.item.end}} ft</template>
</b-table>
</b-col>
</b-row>
Expand Down Expand Up @@ -332,9 +332,9 @@ Licensed under the Apache License, Version 2.0 (the "License");
:fields="['from', 'to', 'diameter', 'assembly_type', 'slot_size']"
show-empty
>
<template slot="from" slot-scope="data">{{data.item.start}} ft</template>
<template slot="to" slot-scope="data">{{data.item.end}} ft</template>
<template slot="assembly_type" slot-scope="data">{{codeToDescription('screen_assemblies', data.item.assembly_type)}}</template>
<template v-slot:cell(from)="data">{{data.item.start}} ft</template>
<template v-slot:cell(to)="data">{{data.item.end}} ft</template>
<template v-slot:cell(assembly_type)="data">{{codeToDescription('screen_assemblies', data.item.assembly_type)}}</template>
</b-table>
</b-col>
</b-row>
Expand Down Expand Up @@ -458,9 +458,9 @@ Licensed under the Apache License, Version 2.0 (the "License");
'comments'
]"
show-empty>
<template slot="pumping_test_description" slot-scope="data">{{codeToDescription('pumping_test_description_codes', data.item.pumping_test_description)}}</template>
<template slot="boundary_effect" slot-scope="data">{{codeToDescription('boundary_effect_codes', data.item.boundary_effect)}}</template>
<template slot="analysis_method" slot-scope="data">{{codeToDescription('analysis_method_codes', data.item.analysis_method)}}</template>
<template v-slot:cell(pumping_test_description)="data">{{codeToDescription('pumping_test_description_codes', data.item.pumping_test_description)}}</template>
<template v-slot:cell(boundary_effect)="data">{{codeToDescription('boundary_effect_codes', data.item.boundary_effect)}}</template>
<template v-slot:cell(analysis_method)="data">{{codeToDescription('analysis_method_codes', data.item.analysis_method)}}</template>
</b-table>
</div>
</fieldset>
Expand Down
8 changes: 4 additions & 4 deletions app/frontend/src/surveys/views/Surveys.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
:per-page="perPage"
:current-page="currentPage"
>
<template slot="survey_page" slot-scope="row">
<template v-slot:cell(survey_page)="row">
{{formatPageName(row.item.survey_page)}}
</template>
<template slot="survey_link" slot-scope="row">
<template v-slot:cell(survey_link)="row">
<a :href="row.item.survey_link" target="_blank">{{row.item.survey_link}}</a>
</template>
<template slot="survey_enabled" slot-scope="row">
<template v-slot:cell(survey_enabled)="data">
<b-form-checkbox v-model="row.item.survey_enabled" name="check-button" @input="toggleSurveyEnabled(row.item.survey_guid, row.item.survey_enabled)"/>
</template>
<template slot="remove" slot-scope="row">
<template v-slot:cell(remove)="data">
<b-btn type="button" variant="outline-danger" size="sm" @click="handleRemoveSurvey(row.item.survey_guid)"><i class="fa fa-trash"></i></b-btn>
</template>
</b-table>
Expand Down
Loading

0 comments on commit 20a9ade

Please sign in to comment.