Session: Add session title in Breadcrumb.vue + course home

Author: jmontoyaa

assets/vue/components/Breadcrumb.vue

@@ -37,6 +37,9 @@ export default {
  ...mapGetters('course', {
  course: 'getCourse',
  }),
+ ...mapGetters('session', {
+ session: 'getSession',
+ }),
  items() {
  console.log('Breadcrumb.vue');
  console.log(this.$route.name);
@@ -119,8 +122,14 @@ export default {
 
  // course is set in documents/List.vue
  if (this.course) {
+
+ let sessionTitle = '';
+ if (this.session) {
+ sessionTitle = ' (' + this.session.name + ') ';
+ }
+
  items.push({
- text: this.course.title,
+ text: this.course.title + sessionTitle,
  href: '/course/' + this.course.id + '/home?'+queryParams
  });
  }

assets/vue/main.js

@@ -23,6 +23,7 @@ import calendarEventService from './services/ccalendarevent';
 import toolIntroService from './services/ctoolintro';
 import pageService from './services/page';
 import pageCategoryService from './services/pagecategory';
+import sessionService from './services/session';
 
 import makeCrudModule from './store/modules/crud';
 //import vuetify from './plugins/vuetify' // path to vuetify export
@@ -92,6 +93,12 @@ store.registerModule(
  })
 );
 
+store.registerModule(
+ 'session',
+ makeCrudModule({
+ service: sessionService
+ })
+);
 
 store.registerModule(
  'personalfile',

assets/vue/services/session.js

@@ -0,0 +1,3 @@
+import makeService from './api';
+
+export default makeService('sessions');

assets/vue/store/modules/crud.js

@@ -19,6 +19,7 @@ const initialState = () => ({
  violations: null,
  resourceNode: null,
  course: null,
+ session: null,
 });
 
 const handleError = (commit, e) => {
@@ -59,7 +60,8 @@ export const ACTIONS = {
  SET_VIOLATIONS: 'SET_VIOLATIONS',
  TOGGLE_LOADING: 'TOGGLE_LOADING',
  ADD_RESOURCE_NODE: 'ADD_RESOURCE_NODE',
- ADD_COURSE: 'ADD_COURSE'
+ ADD_COURSE: 'ADD_COURSE',
+ ADD_SESSION: 'ADD_SESSION'
 };
 
 export default function makeCrudModule({
@@ -272,6 +274,28 @@ export default function makeCrudModule({
  })
  .catch(e => handleError(commit, e));
  },
+ findSession: ({ commit }, params) => {
+ const id = params['id'];
+ delete params['id'];
+ if (!service) throw new Error('No service specified!');
+ commit(ACTIONS.TOGGLE_LOADING);
+
+ return service
+ .find(id, params)
+ .then(response => {
+ if (200 === response.status) {
+ return response.json();
+ }
+ })
+
+ .then(item => {
+ commit(ACTIONS.TOGGLE_LOADING);
+ commit(ACTIONS.ADD_SESSION, item);
+
+ return item;
+ })
+ .catch(e => handleError(commit, e));
+ },
  findResourceNode: ({ commit }, params) => {
  const id = params['id'];
  delete params['id'];
@@ -352,6 +376,9 @@ export default function makeCrudModule({
  getCourse: (state) => {
  return state.course;
  },
+ getSession: (state) => {
+ return state.session;
+ },
  },
  mutations: {
  updateField,
@@ -361,6 +388,12 @@ export default function makeCrudModule({
  //this.$set(state, 'resourceNode', item);
  //this.$set(state, 'isLoading', false);
  },
+ [ACTIONS.ADD_SESSION]: (state, item) => {
+ state.session = item;
+ state.isLoading = false;
+ //this.$set(state, 'resourceNode', item);
+ //this.$set(state, 'isLoading', false);
+ },
  [ACTIONS.ADD_RESOURCE_NODE]: (state, item) => {
  state.resourceNode = item;
  state.isLoading = false;

assets/vue/views/course/Home.vue

@@ -3,6 +3,9 @@
  <div class="flex flex-row justify-between border-b-2 border-gray-200 ">
  <div class="line-clamp-1 text-2xl font-bold">
  {{ course.title }}
+ <span v-if="session">
+ ({{ session.name }})
+ </span>
  </div>
 
  <div>
@@ -190,6 +193,7 @@ export default {
  setup() {
  const state = reactive({
  course: [],
+ session: [],
  tools: [],
  shortcuts: [],
  dropdownOpen: false,
@@ -212,6 +216,7 @@ export default {
 
  axios.get(ENTRYPOINT + '../course/' + courseId + '/home.json?sid=' + sessionId).then(response => {
  state.course = response.data.course;
+ state.session = response.data.session;
  state.tools = response.data.tools;
  state.shortcuts = response.data.shortcuts;
  getIntro();

assets/vue/views/documents/List.vue

@@ -358,6 +358,12 @@ export default {
  let courseIri = '/api/courses/' + cid;
  store.dispatch('course/findCourse', { id: courseIri });
  store.dispatch('resourcenode/findResourceNode', { id: '/api/resource_nodes/' + nodeId});
+
+ let sid = toInteger(route.query.sid);
+ if (sid) {
+ let sessionIri = '/api/sessions/' + sid;
+ store.dispatch('session/findSession', { id: sessionIri });
+ }
  },
  data() {
  return {

src/CoreBundle/Controller/CourseController.php

@@ -86,6 +86,8 @@ public function indexJson(Request $request, CToolRepository $toolRepository, CSh
  }
  }
 
+ $courseSession = $this->getCourseSession();
+
  $isSpecialCourse = CourseManager::isSpecialCourse($courseId);
 
  if ($user && $isSpecialCourse && (isset($_GET['autoreg']) && 1 === (int) $_GET['autoreg']) &&
@@ -189,6 +191,7 @@ public function indexJson(Request $request, CToolRepository $toolRepository, CSh
  }
  $responseData = [
  'course' => $course,
+ 'session' => $courseSession,
  'shortcuts' => $shortcuts,
  'diagram' => $diagram,
  'tools' => $tools,

src/CoreBundle/Entity/Session.php

@@ -80,7 +80,7 @@ class Session implements ResourceWithAccessUrlInterface
  * @ORM\Id
  * @ORM\GeneratedValue()
  */
- #[Groups(['session:read', 'session_rel_user:read', 'session_rel_course_rel_user:read'])]
+ #[Groups(['session:read', 'session_rel_user:read', 'session_rel_course_rel_user:read', 'course:read'])]
  protected ?int $id = null;
 
  /**
@@ -152,7 +152,14 @@ class Session implements ResourceWithAccessUrlInterface
  * @ORM\Column(name="name", type="string", length=150)
  */
  #[Assert\NotBlank]
- #[Groups(['session:read', 'session:write', 'session_rel_course_rel_user:read', 'document:read', 'session_rel_user:read'])]
+ #[Groups([
+ 'session:read',
+ 'session:write',
+ 'session_rel_course_rel_user:read',
+ 'document:read',
+ 'session_rel_user:read',
+ 'course:read',
+ ])]
  protected string $name;
 
  /**