Merge pull request #5 from filips123/improve-date-and-list-handling

Author: filips123

API/gimvicurnik/updaters/menu.py

@@ -94,15 +94,16 @@ def _get_date(url):
 
         # Example: KOSILO-4jan-8jan-2021.pdf
         # Another example: KOSILO-25jan-29jan-2021-PDF.pdf
-        date = re.search(r"(?:KOSILO|MALICA)-(\d+)([a-z]+)-\d+[a-z]+-(\d+)(?i:-PDF)?.pdf", url)
+        date = re.search(r"(?:KOSILO|MALICA)-(\d+)([a-z]+)-\d+[a-z]+-(\d+)(?i:-PDF)?\.pdf", url)
 
         if date:
             return datetime.date(
                 year=int(date.group(3)), month=short_month_to_number[date.group(2)], day=int(date.group(1))
             )
 
         # Example: 09-splet-oktober-1-teden-09-M.pdf
-        date = re.search(r"\d+-splet-([a-z]+)-(\d)-teden-\d+-[MK]-?\d?.pdf", url)
+        # Another example: 05-splet-februar-3-teden-M-PDF.pdf
+        date = re.search(r"\d+-splet-([a-z]+)-(\d)-teden-?\d*-[MK]-?\d?(?i:-PDF)?\.pdf", url)
 
         if date:
             year = datetime.datetime.now().year
@@ -121,6 +122,7 @@ def _get_date(url):
             # Get start of nth week of month
             first = datetime.date(year, month, 1)
             diff = -first.weekday() if month == 9 else 7 - first.weekday()
+            diff = diff if diff < 7 else 0
             new = first + datetime.timedelta(weeks=week - 1, days=diff)
 
             return new

API/poetry.lock

@@ -41,15 +41,15 @@ python = "^3.6"
 PyYAML = "^5.4.1"
 Flask = "^1.1.2"
 click = "^7.1.2"
-schema = "^0.7.3"
+schema = "^0.7.4"
 requests = "^2.25.1"
-SQLAlchemy = "^1.3.22"
+SQLAlchemy = "^1.3.23"
 pdf2docx = "^0.4.6"
 beautifulsoup4 = { extras = ["lxml"], version = "^4.9.3" }
-sentry-sdk = { extras = ["flask", "sqlalchemy"], version = "^0.19.5", optional = true }
+sentry-sdk = { extras = ["flask", "sqlalchemy"], version = "^0.20.0", optional = true }
 
 [tool.poetry.dev-dependencies]
-flakehell = "^0.7.1"
+flakehell = "^0.9.0"
 black = "^20.8b1"
 flake8-black = "^0.2.1"
 flake8-bugbear = "^20.11.1"

API/pyproject.toml

@@ -21,23 +21,23 @@
   },
   "dependencies": {
     "@mdi/js": "^5.9.55",
-    "@sentry/tracing": "^6.0.3",
-    "@sentry/vue": "^6.0.3",
+    "@sentry/tracing": "^6.1.0",
+    "@sentry/vue": "^6.1.0",
     "pulltorefreshjs": "^0.1.21",
     "register-service-worker": "^1.7.2",
     "vue": "^2.6.12",
     "vue-class-component": "^7.2.6",
     "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.5.1",
-    "vuetify": "^2.4.3",
+    "vuetify": "^2.4.4",
     "vuex": "https://github.com/filips123/vuex#preservestate-options-dist",
     "vuex-module-decorators": "https://github.com/filips123/vuex-module-decorators#combined-dist",
     "vuex-persist": "^3.1.3"
   },
   "devDependencies": {
     "@types/pulltorefreshjs": "^0.1.4",
-    "@typescript-eslint/eslint-plugin": "^4.14.1",
-    "@typescript-eslint/parser": "^4.14.1",
+    "@typescript-eslint/eslint-plugin": "^4.15.0",
+    "@typescript-eslint/parser": "^4.15.0",
     "@vue/cli-plugin-babel": "^4.5.11",
     "@vue/cli-plugin-eslint": "^4.5.11",
     "@vue/cli-plugin-pwa": "^4.5.11",
@@ -50,14 +50,14 @@
     "eslint": "^7.19.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "eslint-plugin-vue": "^7.5.0",
-    "sass": "^1.32.5",
+    "sass": "^1.32.7",
     "sass-loader": "^10.1.1",
-    "typescript": " ^4.1.3",
+    "typescript": " ^4.1.5",
     "vue-cli-plugin-vuetify": "^2.1.0",
     "vue-template-compiler": "^2.6.12",
-    "vuetify-loader": "^1.7.1"
+    "vuetify-loader": "^1.7.2"
   }
 }

website/package.json

@@ -30,10 +30,13 @@ import { displaySnackbar } from '@/utils/snackbar'
 export default class SelectClass extends Vue {
   @Prop() isDialog!: boolean
 
-  availableClasses = StorageModule.classList
   selectedClasses: string[] = []
   saveSelection = true
 
+  get availableClasses (): ({value: string, text: string} | string)[] {
+    return StorageModule.classList || []
+  }
+
   closeDialog (): void {
     this.$emit('closeDialog')
   }

website/src/components/settings/entitySelection/SelectClass.vue

@@ -31,10 +31,13 @@ import { displaySnackbar } from '@/utils/snackbar'
 export default class SelectClassroom extends Vue {
   @Prop() isDialog!: boolean
 
-  availableClassrooms = [{ value: 'empty', text: 'Proste učilnice' }, ...(StorageModule.classroomList || [])]
   selectedClassroom: string | null = null
   saveSelection = true
 
+  get availableClassrooms (): ({value: string, text: string} | string)[] {
+    return [{ value: 'empty', text: 'Proste učilnice' }, ...(StorageModule.classroomList || [])]
+  }
+
   closeDialog (): void {
     this.$emit('closeDialog')
   }

website/src/components/settings/entitySelection/SelectClassroom.vue

@@ -27,10 +27,13 @@ import { displaySnackbar } from '@/utils/snackbar'
 export default class SelectTeacher extends Vue {
   @Prop() isDialog!: boolean
 
-  availableTeachers = StorageModule.teacherList
   selectedTeacher: string | null = null
   saveSelection = true
 
+  get availableTeachers (): ({value: string, text: string} | string)[] {
+    return StorageModule.teacherList || []
+  }
+
   closeDialog (): void {
     this.$emit('closeDialog')
   }