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

[PR] Energy Filters Frontend Revamp #268

Merged
merged 3 commits into from
Oct 5, 2023
Merged

[PR] Energy Filters Frontend Revamp #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f6878c
poc done but css needs work
solderq35 Oct 3, 2023
433562a
final mobile test then feature done
solderq35 Oct 5, 2023
e82afbb
remove comments, console logs, reset env
solderq35 Oct 5, 2023
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
5 changes: 5 additions & 0 deletions src/components/building_list/building_list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
<el-tabs v-model="openName" class="tab_row" v-if="buildingList" v-loading="this.loading">
<el-tab-pane v-for="(item, key) in groups" :key="key" :name="key">
<span slot="label" class="tab_label">{{ key }}</span>
<el-radio v-model="search" label="">All</el-radio>
<el-radio v-model="search" label="Electricity">Electricity</el-radio>
<el-radio v-model="search" label="Steam">Steam</el-radio>
<el-radio v-model="search" label="Solar Panel">Solar</el-radio>
<el-radio v-model="search" label="Gas">Gas</el-radio>
<el-row type="flex" justify="left" class="card_flex">
<el-col v-for="building in item" :key="building.name" :span="4" class="card_container">
<viewCard
Expand Down
66 changes: 54 additions & 12 deletions src/components/map/map.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,19 @@
<el-menu-item index="Residence" :class="[isDisplayed('Residence') ? 'active' : 'notactive']"
><span class="res swatch"></span>Residence</el-menu-item
>
<el-menu-item index="Solar" :class="[isDisplayed('Solar') ? 'active' : 'notactive']"
><span class="sol swatch"></span>Solar</el-menu-item
<el-menu-item index="Operations" :class="[isDisplayed('Operations') ? 'active' : 'notactive']"
><span class="operations swatch"></span>Operations</el-menu-item
>
<div class="energyRadioGroup">
<div class="colorByTitle">Energy Type:</div>
<div class="energyRadioButtons">
<el-radio v-model="selectedOption" label="All">All</el-radio>
<el-radio v-model="selectedOption" label="Electricity">Electricity</el-radio>
<el-radio v-model="selectedOption" label="Steam">Steam</el-radio>
<el-radio v-model="selectedOption" label="Solar Panel">Solar</el-radio>
<el-radio v-model="selectedOption" label="Gas">Gas</el-radio>
</div>
</div>
</el-menu-item-group>
<el-menu-item-group v-if="grouping === 'Energy Trend'">
<el-col class="trendBox">
Expand Down Expand Up @@ -157,6 +167,7 @@ export default {
},
data () {
return {
selectedOption: 'All',
searchGroup: [],
search: '',
zoom: DEFAULT_ZOOM,
Expand All @@ -175,12 +186,12 @@ export default {
askingForComparison: false,
building_compare_error: false,
selected: [
'Residence',
'Athletics & Rec',
'Dining',
'Academics',
'Events & Admin',
'Solar',
'Operations',
'Residence',
'Stable Trend',
'Up Trend',
'Down Trend'
Expand Down Expand Up @@ -224,12 +235,12 @@ export default {
case 'Athletics & Rec':
color = '#FFB500'
break
case 'Operations':
color = '#4169E1'
break
case 'Dining':
color = '#4A773C'
break
case 'Solar':
color = '#4169E1'
break
default:
break
}
Expand Down Expand Up @@ -448,6 +459,27 @@ export default {
} )
},
watch: {
selectedOption ( newVal ) {
this.rKey++
this.$nextTick( () => {
this.map = this.$refs.map.mapObject
for ( var layerKey of Object.keys( this.map._layers ) ) {
let layer = this.map._layers[layerKey]
if ( layer.feature && newVal !== 'All' ) {
let descArray = this.$store.getters['map/building']( layer.feature.properties.id ).description.split( ', ' )
let descLength = 0
for ( let i = 0; i < descArray.length; i++ ) {
if ( newVal.includes( descArray[i] ) ) {
descLength += 1
}
}
if ( descLength === 0 ) {
this.map.removeLayer( layer )
}
}
}
} )
},
grouping: {
handler: function ( value ) {
this.search = ''
Expand All @@ -462,9 +494,6 @@ export default {
if ( this.grouping === 'Category' ) {
var color = '#000'
switch ( layer.feature.properties.group ) {
case 'Residence':
color = '#D3832B'
break
case 'Academics':
color = '#0D5257'
break
Expand All @@ -477,9 +506,12 @@ export default {
case 'Dining':
color = '#4A773C'
break
case 'Solar':
case 'Operations':
color = '#4169E1'
break
case 'Residence':
color = '#D3832B'
break
default:
break
}
Expand Down Expand Up @@ -603,6 +635,16 @@ $sideMenu-width: 250px;
text-align: center;
font-family: 'stratumno2';
}
.energyRadioButtons {
margin-left: 20px;
margin-top: 15px;
}
.energyRadioGroup {
margin-top: 20px;
}
.el-radio {
color: white;
}
.stage {
padding: 0;
position: absolute;
Expand Down Expand Up @@ -715,7 +757,7 @@ $sideMenu-width: 250px;
background-color: #7a6855b3;
border-color: #7a6855;
}
.active .sol.swatch {
.active .operations.swatch {
background-color: #4169e1;
border-color: #00008b;
}
Expand Down
Loading