+ {{conflict.room.name}},
+ {{ formatLocaleDate(conflict.start_time )}}
+
{{availability.person.published_name}}
@@ -26,13 +30,14 @@
diff --git a/app/javascript/people/person_tabs.vue b/app/javascript/people/person_tabs.vue
index 8957ad0e4..7c36bdcdc 100644
--- a/app/javascript/people/person_tabs.vue
+++ b/app/javascript/people/person_tabs.vue
@@ -1,55 +1,54 @@
-
Back
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Back
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -60,6 +59,7 @@ import AvailabilityAndInterests from '../profile/availability_and_interests.vue'
import PersonDetails from '../profile/person_details.vue'
import PersonSummary from '../profile/person_summary.vue';
import PersonDemographics from '../profile/person_demographics.vue';
+import ModelLoadingOverlay from '@/components/model_loading_overlay.vue';
import { personModel } from '@/store/person.store'
import { sessionModel } from '@/store/session.store'
@@ -82,7 +82,8 @@ export default {
SessionRanker,
AvailabilityAndInterests,
PersonDetails,
- PersonDemographics
+ PersonDemographics,
+ ModelLoadingOverlay
},
mixins: [
personSessionMixin,
@@ -93,9 +94,11 @@ export default {
personModel,
sessionModel,
sessionAssignmentModel,
- person: null,
}),
computed: {
+ person() {
+ return this.selected_model(personModel);
+ },
start_time() {
if (this.currentSettings && this.currentSettings.configs) {
let st = this.configByName('convention_start_time')
@@ -121,34 +124,35 @@ export default {
}
},
methods: {
- onPersonUpdate(arg) {
- this.person = arg
- },
back() {
- this.$router.push('/people');
+ this.$router.push('/people')
},
handleTabActivation(newTab, oldTab, bvEvent) {
let path = '';
+ const pathStart = this.$route.path.split('/')[1];
switch(newTab) {
case 0:
- path = `edit/${this.person.id}`;
+ path = pathStart === 'people' ? 'edit' : '';
break;
case 1:
- path = `other/${this.person.id}`;
+ path = `other`;
break;
case 2:
- path = `availability/${this.person.id}`;
+ path = `availability`;
break;
case 3:
- path = `session-selection/${this.person.id}`;
+ path = `session-selection`;
break;
case 4:
- path = `session-ranking/${this.person.id}`;
+ path = `session-ranking`;
break;
}
// change the router path to match the current tab
// so that reloads work right
- this.$router.push(`/people/${path}`).catch(error => {
+ if(pathStart === 'people') {
+ path += `/${this.person.id}`
+ }
+ this.$router.push(`/${pathStart}/${path}`).catch(error => {
if(!isNavigationFailure(error, NavigationFailureType.duplicated)) {
// ignore the duplicates, otherwise -
throw error;
@@ -157,14 +161,30 @@ export default {
}
},
mounted() {
- // get id from URL if present
- let id = this.id ? this.id : this.currentUser.id
- this.fetch_model_by_id(personModel, id).then(
- (obj) => {
- this.person = obj
+ this.$nextTick(
+ () => {
+ // get id from URL if present
+ let id = this.id || this.currentUser.id;
+ let selectedPerson = this.selected_model(personModel);
+ // don't fetch if already here... todo figure out if we
+ // want to lazy fetch anyhow
+ if (selectedPerson?.id !== id) {
+ // tick
+ this.unselect_model(personModel);
+ this.fetch_model_by_id(personModel, id).then(() =>
+ this.select_model(personModel, id)
+ );
+ }
}
)
},
+ beforeRouteLeave(to, from, next) {
+ if (from.path.match(/.*profile.*/) && to.path === '/people') {
+ // going from profile to people, clear the selection
+ this.unselect_model(personModel)
+ }
+ next();
+ }
}
diff --git a/app/javascript/profile/availability_and_interests.vue b/app/javascript/profile/availability_and_interests.vue
index 7bd377fc8..6cb2aadd7 100644
--- a/app/javascript/profile/availability_and_interests.vue
+++ b/app/javascript/profile/availability_and_interests.vue
@@ -100,12 +100,12 @@ export default {
required: true
},
start_time: {
- type: DateTime,
+ //type: DateTime,
// default: null
required: true
},
end_time: {
- type: DateTime,
+ //type: DateTime,
required: true
},
timezone: {
diff --git a/app/javascript/profile/dl_person.vue b/app/javascript/profile/dl_person.vue
new file mode 100644
index 000000000..753d8822d
--- /dev/null
+++ b/app/javascript/profile/dl_person.vue
@@ -0,0 +1,42 @@
+
+
+
+ -
+
+ {{PROFILE_FIELD_LABELS[field]}}
+
+
+ -
+
+ Restricted
+ Yes
+ No
+ Not Specified
+ {{selected[field]}}
+
+
+
+
+
+
+
+
diff --git a/app/javascript/profile/dl_person_with_edit.vue b/app/javascript/profile/dl_person_with_edit.vue
new file mode 100644
index 000000000..3d4ae69c6
--- /dev/null
+++ b/app/javascript/profile/dl_person_with_edit.vue
@@ -0,0 +1,66 @@
+
+
+
{{title}}
+
+
+
+
+ Edit {{title}} - {{selected.published_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/profile/person_demographics.vue b/app/javascript/profile/person_demographics.vue
index e24a32693..187bbc7c6 100644
--- a/app/javascript/profile/person_demographics.vue
+++ b/app/javascript/profile/person_demographics.vue
@@ -1,49 +1,104 @@
-
-
-
-
Demographics
-
- - Ethnicity
- - {{selected.ethnicity | na_if_empty}}
- - Gender
- - {{selected.gender | na_if_empty}}
- - Age at time of Event
- - {{selected.age_at_convention | na_if_empty}}
- - Romantic and/or sexual orientation
- - {{selected.romantic_sexual_orientation | na_if_empty}}
-
-
-
-
Community memberships
-
- - Experience with being “othered”
- - {{selected.othered | na_if_empty }}
- - Member of an Indigenous community
- - {{selected.indigenous | na_if_empty}}
- - Member of the global Black diaspora
- - {{selected.black_diaspora | na_if_empty}}
- - Represent something other than a purely US-centric perspective
- - {{selected.non_us_centric_perspectives| na_if_empty}}
- - Other demographic categories
- - {{selected.demographic_categories | na_if_empty }}
-
-
-
-
+
+
+
Community memberships
+
+
+
-
-
+
diff --git a/app/javascript/profile/person_details.vue b/app/javascript/profile/person_details.vue
index 73e0af158..41f123a08 100644
--- a/app/javascript/profile/person_details.vue
+++ b/app/javascript/profile/person_details.vue
@@ -1,59 +1,25 @@
-
+
-
-
-
-
-
-
+
-
-
-
-
-
- {{yesLabel.label}}
- {{noLabel.label}}
- {{maybeLabel.label}}
-
-
-
-
-
- {{yesLabel.label}}
- {{noLabel.label}}
- {{maybeLabel.label}}
-
-
-
-
- Local to the event
-
-
-
-
-
+
Preferences
+
+ {{can_stream_label}}
+ {{can_record_label}}
+
I plan to attend the convention:
In Person
In Person AND Virtually
@@ -61,10 +27,10 @@
Your time now in the selected timezone is {{youTimeNow}}
@@ -78,97 +44,132 @@
and check by specifying the date of September 1 2022 and your location as well as UTC/GMT
-
-
+ Bio
+
+ Social Media
+
+
+
+ Edit Bio - {{selected.published_name}}
+
-
- Social Media
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Edit Preferences - {{selected.published_name}}
+
+
+
+
+
+
+
+
+
+ {{yesLabel.label}}
+ {{noLabel.label}}
+ {{maybeLabel.label}}
+
+
+
+
+
+ {{yesLabel.label}}
+ {{noLabel.label}}
+ {{maybeLabel.label}}
+
+
+
+
+ Local to the event
+
+
+
+
+
+
+
+ Edit Socials - {{selected.published_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/profile/person_summary.vue b/app/javascript/profile/person_summary.vue
index 1fbb640d0..df453aefe 100644
--- a/app/javascript/profile/person_summary.vue
+++ b/app/javascript/profile/person_summary.vue
@@ -1,50 +1,86 @@
-
-
-
-
{{person.published_name}}
+
+
+
+
{{selected.published_name}}
+
+
+ Last Login: {{formatLocaleDate(selected.current_sign_in_at)}}
+
-
- Last Login: {{formatLocaleDate(person.current_sign_in_at)}}
-
-
-
- Pronouns:
{{person.pronouns}}
-
- Willing to moderate sessions: {{willing_to_moderate}}
-
-
- Primary email:
{{person.primary_email.email}}
+
+ Pronouns:
{{selected.pronouns}}
+
+ Willing to moderate sessions: {{willing_to_moderate}}
+
+
+ Primary email: {{selected.primary_email.email}}
+
+
+ Edit Profile - {{selected.published_name}}
+
+
+
+
+
+
+
+
+
+
+
+ Willing to moderate session
+
+
+
-
-
-
diff --git a/app/javascript/schedule/room_selector.vue b/app/javascript/schedule/room_selector.vue
index 0d2df2cc6..2354b7290 100644
--- a/app/javascript/schedule/room_selector.vue
+++ b/app/javascript/schedule/room_selector.vue
@@ -1,7 +1,7 @@
-
+
Displayed Rooms
Select All
-
+
import IconButton from '@/components/icon_button.vue';
import PlanoModal from '@/components/plano_modal.vue';
+import { modelMixinNoProp } from '@/store/model.mixin';
+import { mapMutations, mapState } from 'vuex';
+import { SET_ROOMS_FOR_SCHEDULING } from '@/store/room.store';
+
export default {
name: "RoomSelector",
- props: {
- rooms: {
- type: Array
- }
- },
+ mixins: [
+ modelMixinNoProp
+ ],
components: {
PlanoModal,
IconButton
},
data: () => ({
selectAll: true,
- selectedRooms: []
+ model: 'room',
+ selectedRooms: [],
}),
+ computed: {
+ ...mapState(['roomsForScheduling']),
+ },
methods: {
+ ...mapMutations({
+ setRoomsForScheduling: SET_ROOMS_FOR_SCHEDULING
+ }),
onSelectAll(v) {
if (v) {
- this.selectedRooms = this.rooms.map((r) => r.id)
+ this.selectedRooms = this.collection.map((r) => r.id)
} else {
this.selectedRooms = []
}
- // this.$emit('change', this.selectedRooms)
},
updateSelectRooms() {
- this.$refs['select-all'].checked = this.selectedRooms.length == this.rooms.length
- // this.$emit('change', this.selectedRooms)
+ this.selectAll = this.selectedRooms?.length === this.collection?.length
},
ok() {
- this.$emit('change', this.selectedRooms)
+ this.setRoomsForScheduling(this.selectedRooms);
+ },
+ show() {
+ this.selectedRooms = this.roomsForScheduling;
+ this.updateSelectRooms();
}
},
- mounted() {
- if (this.rooms) {
- this.selectedRooms = this.rooms.map((r) => r.id)
- }
- }
}
diff --git a/app/javascript/schedule/schedule_day.vue b/app/javascript/schedule/schedule_day.vue
index a03862e70..34cfaf655 100644
--- a/app/javascript/schedule/schedule_day.vue
+++ b/app/javascript/schedule/schedule_day.vue
@@ -17,26 +17,29 @@
ref="dayRoomGrid"
:events="events"
@event-drop="onEventDrop"
- @event-mouse-enter="onEventEnter"
- @event-mouse-leave="onEventLeave"
:on-event-click="onEventClick"
>
-
{{ formatDate(view.selectedDate, { weekday: 'long' }) }},
{{ formatDate(view.selectedDate, { day: 'numeric', month: 'short' }) }}
-
-
-
- {{ formatDatetime(event.actual_start) }} - {{ formatDatetime(event.actual_end) }}
+
+
+
+
+ {{ formatDatetime(event.actual_start) }} - {{ formatDatetime(event.actual_end) }}
+
+
+
+
+ {{event.title}}
-
-
- {{event.title}}
-