Skip to content
Snippets Groups Projects

Draft: Resolve "[New data model] PDF export for "regular" timetable"

Open Draft: Resolve "[New data model] PDF export for "regular" timetable"
46-new-data-model-pdf-export-for-regular-timetable into master
Open Jonathan Weth requested to merge 46-new-data-model-pdf-export-for-regular-timetable into master

Closes #46

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
aleksis/apps/lesrooster/frontend/components/timetables/Timetable.vue 0 → 100644
38 } else if (!selected && !this.timeGrid) {
39 this.$router.push({ name: "lesrooster.timetable" });
40 } else if (
41 selected.objId !== this.$route.params.id ||
42 selected.type.toLowerCase() !== this.$route.params.type ||
43 this.timeGrid.id !== this.$route.params.timeGrid
44 ) {
45 this.$router.push({
46 name: "lesrooster.timetableWithId",
47 params: {
48 timeGrid: this.timeGrid.id,
49 type: selected.type.toLowerCase(),
50 id: selected.objId,
51 },
52 });
53 }
  • Jonathan Weth
    Jonathan Weth @hansegucker ·
    Author Owner

    grafik

    grafik

    grafik

  • Jonathan Weth added 15 commits

    added 15 commits

    • a3c51cfd...3a47eb8e - 9 commits from branch master
    • a6c397f2 - Improve and restructure mini timetables, include mini timetable for teachers
    • ce6f8c64 - Support displaying dates of validity ranges in TimeGridField
    • 258c882d - Introduce view for regular timetables
    • e3eed6cc - Fix mobile view for validity range select in timetables
    • ef7b2083 - Add print view for regular timetables
    • bf56787f - Add print button to timetable view

    Compare with previous version

    Toggle commit list
  • Jonathan Weth requested review from @ZugBahnHof

    requested review from @ZugBahnHof

  • Jonathan Weth
    Jonathan Weth @hansegucker ·
    Author Owner

    workflow::blocked by AlekSIS/official/AlekSIS-App-Chronos!347 (merged)

  • Jonathan Weth added workflow::blocked label

    added workflow::blocked label

  • Julian @ZugBahnHof started a thread on the diff
    • aleksis/apps/lesrooster/frontend/components/timetable_management/timetables/RoomTimeTable.vue → aleksis/apps/lesrooster/frontend/components/timetables/RoomTimeTable.vue
    7 7 name: "RoomTimeTable",
    8 8 extends: MiniTimeTable,
    9 9 props: {
    10 roomId: {
    10 id: {
    • Comment on lines -10 to +10
      Z
      Julian @ZugBahnHof ·
      Developer

      If the prop is named the same it should probably be in the supercomponent (but maybe not as it isn't used there, what do you think?)

    • Please register or sign in to reply
  • Julian @ZugBahnHof started a thread on the diff
    • aleksis/apps/lesrooster/frontend/components/timetables/Timetable.vue 0 → 100644
    109 </v-btn>
    110 </div>
    111 </template>
    112 <template #default="{ selected }">
    113 <group-time-table
    114 v-if="$route.params.type === 'group'"
    115 v-bind="timetableAttrs"
    116 />
    117 <teacher-time-table
    118 v-else-if="$route.params.type === 'teacher'"
    119 v-bind="timetableAttrs"
    120 />
    121 <room-time-table
    122 v-else-if="$route.params.type === 'room'"
    123 v-bind="timetableAttrs"
    124 />
  • Julian @ZugBahnHof started a thread on the diff
    • aleksis/apps/lesrooster/templates/lesrooster/timetable_print.html 0 → 100644
    1 {% extends 'core/base_print.html' %}
    2
    3 {% load data_helpers static i18n %}
    4
    5 {% block extra_head %}
    6 <link rel="stylesheet" href="{% static 'css/lesrooster/timetable_print.css' %}">
    7 {% endblock %}
    8
    9 {% block page_title %}
    10 {% trans "Timetable" %} <i>{{ el.short_name }}</i>
  • Jonathan Weth added 8 commits

    added 8 commits

    • bf56787f...b40146fb - 2 commits from branch master
    • 07e54625 - Improve and restructure mini timetables, include mini timetable for teachers
    • 0409ac29 - Support displaying dates of validity ranges in TimeGridField
    • ba0f1b66 - Introduce view for regular timetables
    • 49149426 - Fix mobile view for validity range select in timetables
    • caa31f34 - Add print view for regular timetables
    • 245fb121 - Add print button to timetable view

    Compare with previous version

    Toggle commit list
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
    • Please register or sign in to reply