1
0
Fork 0
mirror of https://codeberg.org/Mo8it/AdvLabDB.git synced 2024-11-08 21:21:06 +00:00
Commit graph

470 commits

Author SHA1 Message Date
24c9f44b25 Add Flask-Migrate 2022-05-29 18:13:28 +02:00
1398a9bb92 Remove RoleView 2022-05-29 17:32:58 +02:00
dd4908cc45 Fix analysis 2022-05-23 00:56:10 +02:00
ec70d966ac Replace self.column 2022-05-21 21:19:26 +02:00
71835521bf Fix missing import 2022-05-21 21:14:10 +02:00
5a3125d1d1 Fix calling execute 2022-05-21 21:12:15 +02:00
7759a144b2 Replace all .filter() 2022-05-21 21:04:06 +02:00
91826cc98d Replace all .has() 2022-05-21 20:56:02 +02:00
d7886eb773 Join 2022-05-21 18:44:53 +02:00
18ae6bacb0 Fix typo 2022-05-21 18:44:40 +02:00
303d8b23be Use query_modifier in adminSpace 2022-05-21 18:32:34 +02:00
1ba0659f71 Use query_modifier in assistantSpace 2022-05-21 18:30:23 +02:00
56c7212323 Add rsync to optional software 2022-05-21 15:53:30 +02:00
12928397ac Fix function call 2022-05-20 21:05:16 +02:00
a3c63e3c0f Add customUpdateModel 2022-05-20 21:05:16 +02:00
6c268c3bb5 Fix bug for user that are not logged in 2022-05-20 21:05:16 +02:00
2236edb8aa Require active_semester 2022-05-20 21:03:24 +02:00
e71d711090 Fix typo bug 2022-05-20 21:03:24 +02:00
6618e72843 Improve performance by removing userActiveSemester() 2022-05-20 21:03:24 +02:00
b2428d29f3 Change queryFilter to query_modifier 2022-05-20 21:03:24 +02:00
854abb093b Use get_first in database_import.py 2022-05-20 21:03:24 +02:00
5b6f0d76f2 Use get_first() in models.py 2022-05-20 20:56:04 +02:00
5541435a30 Organize funs 2022-05-20 20:56:04 +02:00
48c6f4a744 Replace count() 2022-05-20 20:54:47 +02:00
eba6122aef Add get_count 2022-05-20 20:54:47 +02:00
0c5709d2ab Migrate database_import.py 2022-05-20 20:54:47 +02:00
659156b749 highestGroupNumber 2022-05-20 20:46:05 +02:00
5627b88051 Fix missing dep 2022-05-20 20:46:05 +02:00
b26cd94fa5 Use adjusted semester sorting function 2022-05-20 20:46:05 +02:00
a8117b7e72 Sorting semesters 2022-05-20 20:37:29 +02:00
af7fcaa59c Migrate all() 2022-05-20 20:37:29 +02:00
4332e145b7 Use session.get 2022-05-20 20:37:29 +02:00
3022c377b4 Use back_populates instead of backref 2022-05-20 20:37:29 +02:00
d2a0700f7d Use session.get 2022-05-20 20:37:29 +02:00
ec3664a30a Improve error message 2022-05-18 01:25:51 +02:00
6ea51b1235 Fix database_import.py script 2022-05-18 01:08:07 +02:00
b2c63c90af Fix call of undefined function 2022-05-18 01:07:27 +02:00
57e81092fe Fix validation 2022-05-17 13:39:08 +02:00
d5dff6ccda Catch error while initializing the database 2022-05-17 13:24:16 +02:00
30365a1bf3 Add generate_secrepts.py 2022-05-17 12:44:17 +02:00
da214f6046 Use template for advlabdb.conf 2022-05-17 12:37:44 +02:00
3f3eba9fde Fix calling logged_server_setup 2022-05-17 12:12:52 +02:00
c8ebffefc8 Convert path to string 2022-05-17 12:09:54 +02:00
211b83e431 Wrong directory 2022-05-17 12:06:57 +02:00
9ba1dc2925 Insert absolute path 2022-05-17 12:04:56 +02:00
76e8dbba46 Fix running server_setup 2022-05-17 11:58:19 +02:00
68ac180e86 Better descriptions 2022-05-16 03:37:08 +02:00
17f8b43bee Fix function call 2022-05-15 22:38:49 +02:00
fe8dceceba Explicit None check 2022-05-15 22:25:19 +02:00
9ff2405947 Remove Appointment.customInit 2022-05-15 22:24:49 +02:00
2e6151d05f Remove ExperimentMark.customInit 2022-05-15 21:07:00 +02:00
2f7d005ea4 Remove GroupExperiment.customInit 2022-05-15 20:59:57 +02:00
86c7f6d915 Remove PartStudent.customInit 2022-05-15 20:06:54 +02:00
5fd9154901 Remove Semester.customInit 2022-05-15 20:06:54 +02:00
102640f14d Use handle_view_exception 2022-05-15 19:07:08 +02:00
ce913f92eb Use IN and BETWEEN in CHECK 2022-05-15 19:06:28 +02:00
f18e06a39b Add origin main to git pull 2022-05-10 01:28:57 +02:00
f8665c410a Fix running logged_server_setup 2022-05-10 01:26:58 +02:00
ff8ef36615 ADD REPO_DIR constant 2022-05-09 18:03:25 +02:00
85f49824ca Add UserHasRole filter 2022-05-09 02:13:18 +02:00
43983679c8 Add reset_admin_password script 2022-05-09 02:12:04 +02:00
9c35b770a2 Seperate formatting from constraints checking 2022-05-09 02:11:28 +02:00
52514957d1 Fix missing import 2022-05-09 02:10:30 +02:00
3d217383de Add notice about random passwords 2022-05-08 22:04:08 +02:00
11fb5f5428 Use relative imports 2022-05-08 21:26:25 +02:00
1f89e4aaed Organize docs and scripts 2022-05-08 17:29:45 +02:00
daf0b6287f Use longer passwords 2022-05-07 23:55:34 +02:00
3fd804d175 Fix some problems with app context 2022-05-07 23:53:47 +02:00
06a782ef66 Format and make one default callable 2022-05-07 21:05:16 +02:00
f89059f4ac Update poetry update function 2022-05-07 17:01:05 +02:00
3b07efd1af Use relative db dir from .env 2022-05-07 16:48:28 +02:00
6f30f90b64 Add row filters for deduplication 2022-05-07 02:09:37 +02:00
99703439a3 Deduplicate index_view 2022-05-07 01:44:39 +02:00
2de977e1c1 Deduplication of create_form 2022-05-07 01:06:08 +02:00
cf0d71325f Fix constraints 2022-04-18 18:43:55 +02:00
f5d6e29664 Change year to IntegerField 2022-04-18 18:37:21 +02:00
8ab38f11e2 Add constants for constraints 2022-04-18 18:15:52 +02:00
ef4c46d535 Use dotenv 2022-04-18 18:04:48 +02:00
11746b8c67 Split utils.py 2022-04-18 18:04:17 +02:00
05de612e23 Add final part mark analysis 2022-04-12 15:02:05 +02:00
d71070008d Add sorted semesters function 2022-04-12 15:00:12 +02:00
6d281dfe3a Add number, mean and all 2022-04-12 13:29:08 +02:00
d6180f4ccb Improve assistant marks analysis page 2022-04-12 13:25:17 +02:00
b33046dbc3 Add analysis 2022-04-12 01:52:01 +02:00
e891fe4050 Fix max mark constraint 2022-04-12 01:47:37 +02:00
0ee5fcd52b Add min and max mark as constants 2022-04-12 01:44:53 +02:00
47276ff35a Add horizontal line to custom views 2022-04-10 21:04:13 +02:00
7a1c0e9d55 Fix updateFinalExperimentMark 2022-04-10 21:01:56 +02:00
6c84829c4d Add button for manual marks update 2022-04-10 21:01:42 +02:00
cecaf207f2 Add a minimum to number fields 2022-04-04 19:08:19 +02:00
cc3f230a3a No need for a factory 2022-04-04 18:56:16 +02:00
34ee938636 Add step to weighting fields 2022-04-04 18:47:53 +02:00
c43382ac7a Update final experiment and part marks on weighting update 2022-04-04 17:28:16 +02:00
08b5d983ea Fix typos 2022-03-19 22:22:23 +01:00
bb6edca943 Indent templates 2022-03-19 22:21:45 +01:00
4ac2f6140a Update deps 2022-03-17 22:34:00 +01:00
49d1659f82 Fix security issues to prevent assistants from seeing unintended data 2022-03-13 00:37:31 +01:00
027851b398 Explicit expose 2022-03-04 03:49:02 +01:00
3c7b578352 Add filters, row actions, AdminView 2022-03-03 04:26:05 +01:00
874510412b Add details template for assistant 2022-03-03 03:14:13 +01:00
98d52f34c9 Add custom details templates 2022-03-03 03:13:06 +01:00
e1d1ee2f84 Add CustomIdEndpointLinkRowAction 2022-03-03 03:04:15 +01:00
fb084eb17f Use fluid container 2022-03-02 23:35:38 +01:00
158e6603f1 Upgrade to bootstrap 4 2022-03-02 23:35:20 +01:00
820bde2541 Further filter and sort 2022-03-02 18:59:14 +01:00
298eb1cc8f Fix adding to active semester dropdown menu 2022-03-02 02:47:30 +01:00
d50ce61abb Fix database blocking by unintended generators 2022-03-02 02:31:31 +01:00
7b09842932 Polish filters 2022-03-02 01:56:42 +01:00
978dfd340f Add custom filters 2022-03-01 22:23:30 +01:00
205d90f88a Add Admin model 2022-02-27 19:30:28 +01:00
de4ef9d6f4 Move weightings from Experiment to SemesterExperiment 2022-02-27 17:43:31 +01:00
4e6c2ad708 duration_in_days > 0 2022-02-24 02:08:09 +01:00
f287a5325c Fix assistant's editing 2022-02-24 01:28:09 +01:00
d0a6090553 Add number of missing final part marks to both spaces 2022-02-24 01:10:04 +01:00
8d34d3d564 Add number of missing final experiment marks to admin 2022-02-24 00:08:14 +01:00
cbda7e63ae Add changing password for assistants 2022-02-23 20:36:29 +01:00
82e7bc9d23 Add docs links 2022-02-23 19:37:09 +01:00
8a4d83a73f Update deps 2022-02-23 19:34:56 +01:00
dfaba1cf3e Fix typos 2022-02-13 20:05:29 +01:00
6e45c91d45 Black and isort 2022-02-13 19:58:05 +01:00
0b5dcfb460 Added update_docs.sh 2022-01-16 16:13:48 +01:00
0fbe584b4e Added docs structure 2022-01-13 02:25:31 +01:00
22e3e9ff7b Added AssistantUserView 2021-11-30 01:47:37 +01:00
300d869ed8 Fix admin lockout check 2021-11-30 01:41:18 +01:00
52506fc47f Security fix 2021-11-30 01:36:19 +01:00
490eb8e14c Prevent admin lockout 2021-11-29 20:58:14 +01:00
5a03a558c8 Added link to other space if user has both roles 2021-11-29 20:49:18 +01:00
a4a835a5e7 Small fixes 2021-11-29 20:22:10 +01:00
3fc1fd4f0a Added comment to change SERVER_NAME 2021-09-11 22:52:38 +02:00
4f799aa599 Fixed index route 2021-09-11 21:20:36 +02:00
190a666065 Removed unneeded templates 2021-09-11 21:09:08 +02:00
c879fcdbe1 Improved import template 2021-09-11 21:08:37 +02:00
72420615b0 Added ImportView 2021-09-11 20:53:11 +02:00
40ab16f632 Added SecureAdminBaseView 2021-09-11 20:48:14 +02:00
071a5e94b5 Added database_import 2021-09-11 20:47:48 +02:00
794b369a33 Fixed not using Semester.customInit 2021-09-11 15:35:13 +02:00
2ac895e047 Fixed not calling ExperimentMark.customInit 2021-09-11 15:25:13 +02:00
b368453ffb Added DataBaseImportException 2021-09-10 21:41:49 +02:00
f232424d69 Added final experiment mark 2021-08-29 18:15:14 +02:00
96a32a3c3a Improved repr for ExperimentMark 2021-08-21 23:31:16 +02:00
3b7c186baf Fixed for creating Assistant in UserView 2021-08-21 23:21:39 +02:00
c98d85c810 Create Assistant if role was added 2021-08-21 23:18:55 +02:00
4a83ffdabc Added final part mark calculation to assistantSpace 2021-08-21 23:08:32 +02:00
9430654ea1 Improved feedback after changing experiment mark 2021-08-21 22:58:23 +02:00
e998839bf1 Added final_part_mark calculation in adminSpace 2021-08-19 01:29:09 +02:00
03edae883f Remvoed unnecessary check in GroupView 2021-08-18 20:11:40 +02:00
ab1eded4b7 Fixed filtering for GroupView's form 2021-08-18 20:06:18 +02:00
18fac6c683 Simplified ExperimentMarkView 2021-08-18 19:39:21 +02:00
05d17d151d Can't edit final_part_mark and fixed setting edited_by_admin 2021-08-18 19:07:56 +02:00
bd393796f5 Fixed weighting defaults 2021-08-18 18:58:20 +02:00
c2399be719 Added description and updated RoleView 2021-08-16 23:47:04 +02:00
3425947f3e Added some descriptions and applied last commit 2021-08-16 23:32:46 +02:00
43678dd18b Added weightings default and check 2021-08-16 23:30:30 +02:00
bb23670403 User and Assistant harmony 2021-08-16 01:15:19 +02:00
a1df871e9f Added 2 filters to ExperimentMarkView 2021-08-01 01:12:36 +02:00
cdeaa0852f Deactivated queryFilter for ExperimentMarkView for students experiments history 2021-08-01 01:03:27 +02:00
08c86bca0b Improved columns in assistantSpace 2021-08-01 00:41:21 +02:00
a50ad2f73f Added activeSemesterDropDown and logout in assistantSpace 2021-07-31 00:12:37 +02:00
b9621345d7 Added Appointment and ExperimentMark views in assistantSpace 2021-07-30 23:50:10 +02:00
c0ffa136f7 Added some editables 2021-07-30 23:42:20 +02:00
85606123a5 Added customUpdateDate and customUpdateSpecial for Appointment 2021-07-30 23:37:38 +02:00
8333da3c91 Improved filters 2021-07-30 15:14:35 +02:00
e4b29a37d6 isorted 2021-07-30 14:20:54 +02:00
f989cea879 Added AssistantGroupExperimentView 2021-07-30 02:50:49 +02:00
0be6b64b8a Added assistantSpace 2021-07-30 02:03:44 +02:00
e56aca7545 Added active semester default to UserView 2021-07-30 00:46:36 +02:00
6036500f2a Restricted semester label to WS and SS 2021-07-30 00:43:05 +02:00
ba0691015d Added defaults for semester label and year 2021-07-30 00:40:21 +02:00
e85b56444a Fixed last semester 2021-07-30 00:39:59 +02:00
6fab47591f Added customCreateModel 2021-07-30 00:24:10 +02:00
189998c7d3 Removed default for program in ExperimentView 2021-07-29 23:37:18 +02:00
58d1ec73b5 Fixed adding students to a group 2021-07-29 23:18:24 +02:00
1787a84d30 Fixed 2 checks 2021-07-29 21:13:49 +02:00
843e1f5b47 Added changing user's password 2021-07-29 20:55:22 +02:00
8da20c23c3 Added Jinja macros 2021-07-29 20:03:41 +02:00
8bf415220d Done UserView and fixed user filter for AssistantView 2021-07-29 17:37:15 +02:00
6ee368d0ef Done PartView and SemesterView 2021-07-29 16:27:15 +02:00
97497b3ad1 Done ProgramView 2021-07-29 01:04:58 +02:00
5059725dee Done AssistantView 2021-07-29 00:58:50 +02:00
6ac4ab32e0 Done SemesterExperimentView 2021-07-29 00:31:43 +02:00
d92fd2e454 Fix description 2021-07-28 13:59:41 +02:00
d2ab29b0d3 Small fixes 2021-07-16 00:44:26 +02:00
d475e48856 Fixed some nullable arguments, added customInit to Semester 2021-07-16 00:30:56 +02:00
8178c72fe2 Apply changes from the database 2021-07-14 04:27:17 +02:00
bb1b6a86b2 Exception for importing routes and models while running testDB.py 2021-07-14 04:26:18 +02:00
2d268811de Clean up 2021-07-14 04:25:34 +02:00
53a14c0c40 some checks and customInits 2021-07-14 04:24:04 +02:00
48dad91671 Fixed and added checkPartStudents for Group 2021-07-14 01:58:35 +02:00
605edeecca Big changes to the database, mainly due to adding Program 2021-07-13 21:49:44 +02:00
b2655e2023 Fixed customInit for GroupExperiment 2021-07-13 18:41:00 +02:00
91547a7487 Addded exceptions 2021-07-13 17:22:15 +02:00
3024d2661e Fixed markChoices and queryFilter 2021-07-13 03:37:00 +02:00
64165218ca Done ExperimentMarkView 2021-07-13 02:50:15 +02:00
3b6f92efd9 SelectField for final_part_mark 2021-07-12 19:49:10 +02:00
5b62f9e78e Done AppointmentView 2021-07-12 16:42:11 +02:00
b67ba46768 Added customInit 2021-07-12 14:48:29 +02:00
18257799c7 Moved get_query and get_count_query to parent classs 2021-07-12 13:06:44 +02:00
72b05beefc Added CheckConstraints 2021-07-11 14:27:00 +02:00
c9143410d4 Fixed changing active semester 2021-07-11 13:48:13 +02:00
e50ad68d97 Added UniqueConstrains 2021-07-11 03:21:54 +02:00
aa7ab40f1e Removed email from Assistant 2021-07-11 03:17:21 +02:00
dca0ec8828 Changed experiment number to label as string 2021-07-11 01:49:39 +02:00
9247a5aa54 Added active to Experiment and transfer active 2021-07-01 23:17:09 +02:00
f28f9b64fb Added checkAndInit to GroupExperiment and repr() to all Models 2021-07-01 22:20:34 +02:00
5212eb8ee6 Added create_model to GroupExperiment 2021-07-01 19:43:59 +02:00
515c389610 Added experiments history 2021-07-01 16:38:37 +02:00
d30945461b Changed PartExperiment to SemesterExperiment 2021-07-01 14:41:20 +02:00
6e153d9c09 Redirect to login if no access 2021-07-01 14:02:23 +02:00
0a91f4a331 Made modal 2021-07-01 13:12:43 +02:00
c09ab2ffdc Changed Datetime to Date for Appointment 2021-07-01 01:02:44 +02:00
8444f9babc Renamed ModelViews 2021-06-30 22:04:33 +02:00
d9eaafeb6d Improved Students, PartStudents and Groups view 2021-06-30 21:58:57 +02:00
5aa408df89 Changed some int to float 2021-06-30 20:21:44 +02:00
f971c0811f Added Logout Button 2021-06-28 18:43:13 +02:00
f840bd4b20 Transfer part experiments and assistants for new semesters 2021-06-26 01:59:21 +02:00
27c8d3d952 Added GroupExperimentModelView 2021-06-24 19:39:26 +02:00
61cbfe9ec8 Added AssistantModelView 2021-06-24 19:24:14 +02:00
954fe5ff00 Added PartExperimentModelView 2021-06-21 18:26:38 +02:00
78fe69cfe1 Added ExperimentModelView 2021-06-21 18:07:18 +02:00
4124c5cae5 Added wiki_link to Experiment 2021-06-21 18:00:16 +02:00
a352917daa Updated packages 2021-06-14 12:50:09 +02:00
c2917aa3fe Added persistent semester filters 2021-06-10 03:14:30 +02:00
b8da4fa8a8 Cleaned up routes.py 2021-06-09 02:51:26 +02:00
a6314e1c02 Prevent locking admin out 2021-06-09 02:22:37 +02:00
c5a8ef790b Updated SemesterModelView and added session exceptions 2021-06-09 01:07:02 +02:00
699192201f Added GroupModelView 2021-06-07 17:15:10 +02:00
6fcea2ba8a Fixed import order 2021-06-02 23:52:15 +02:00
418b1f66ac Added black and isort 2021-06-02 23:43:41 +02:00
050189ee68 Updated pyproject.toml 2021-06-02 21:27:34 +02:00
ad134a923e Added createParts to Semester 2021-06-02 02:13:52 +02:00
bc8859d521 Added configUtils 2021-06-02 01:56:49 +02:00
dbfc488e8e Updated README 2021-05-18 15:20:03 +02:00
82ee852469 Added setting new semester as active semester 2021-05-18 14:54:30 +02:00
7e1a98b12b Updated README 2021-05-18 13:59:13 +02:00
64fe85272b Cleaned up with flake8 2021-05-17 22:36:24 +02:00
810a3ba496 Added redirecting after login 2021-05-17 22:15:50 +02:00
ad5b3117fd Added admin index template 2021-05-17 21:48:12 +02:00
45c3d55470 Added admin templates 2021-05-17 21:34:49 +02:00
868c1e2d4d Added changing active semester from admin view 2021-05-17 16:55:04 +02:00
6d32b1840d Updated packages, added contact email for students. 2021-05-14 18:53:15 +02:00
31e749033b Old views cleaned up 2021-05-02 18:11:08 +02:00
73d24c5c55 Form tuning 2021-04-27 23:28:47 +02:00
c9023bdfc9 Added PartFilter for PartStudent, fixed set_semester 2021-04-27 15:50:03 +02:00
a5a63166b7 Cleaned up semesters and students views 2021-04-27 14:08:15 +02:00
07dec709f7 Add part student in StudentModelView 2021-04-27 00:26:11 +02:00
48fda40c2c Fixed active semester, added StudentModelView 2021-04-26 21:31:15 +02:00
c86091fe39 Fixed active semester not found 2021-04-24 14:01:14 +02:00
ff0f5cc48c Done Semester and Part views 2021-04-24 13:38:03 +02:00
f4de3df51d Moved users and register to UserModelView 2021-04-24 12:05:58 +02:00
f9dd498d92 Added Flask-Admin and Flask-DebugToolbar 2021-04-19 01:33:46 +02:00