From dca0ec8828a6846944df5d6c7c7d3a118fe8f439 Mon Sep 17 00:00:00 2001 From: Mo8it Date: Sun, 11 Jul 2021 01:49:39 +0200 Subject: [PATCH] Changed experiment number to label as string --- DB.drawio | 2 +- advlabdb/modelViews.py | 14 ++++++- advlabdb/models.py | 6 +-- poetry.lock | 90 +++++++++++++++++++++--------------------- testDB.py | 8 ++-- 5 files changed, 66 insertions(+), 54 deletions(-) diff --git a/DB.drawio b/DB.drawio index 4d2880e..aef895d 100644 --- a/DB.drawio +++ b/DB.drawio @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/advlabdb/modelViews.py b/advlabdb/modelViews.py index af83515..863038a 100644 --- a/advlabdb/modelViews.py +++ b/advlabdb/modelViews.py @@ -352,7 +352,19 @@ class GroupView(SecureModelView): class ExperimentView(SecureModelView): can_view_details = True column_filters = ["active"] - column_list = ["number", "name", "active"] + column_list = ["label", "title", "active"] + column_details_list = column_list + [ + "desciption", + "wiki_link", + "room", + "building", + "responsibility", + "duration_in_days", + "oral_weighting", + "protocol_weighting", + "final_weighting", + "semester_experiments", + ] column_editable_list = ["active"] diff --git a/advlabdb/models.py b/advlabdb/models.py index 6b456ab..b826325 100644 --- a/advlabdb/models.py +++ b/advlabdb/models.py @@ -99,8 +99,8 @@ class GroupExperiment(db.Model): class Experiment(db.Model): id = db.Column(db.Integer, primary_key=True) - number = db.Column(db.Integer, nullable=False, unique=True) - name = db.Column(db.String(200), nullable=False) + label = db.Column(db.String(20), nullable=False, unique=True) + title = db.Column(db.String(200), nullable=False) description = db.Column(db.Text, nullable=True) wiki_link = db.Column(db.String(200), nullable=True) room = db.Column(db.String(100), nullable=False) @@ -114,7 +114,7 @@ class Experiment(db.Model): semester_experiments = db.relationship("SemesterExperiment", backref="experiment", lazy=True) def repr(self): - return f"{self.number}" + return f"{self.label}" def __repr__(self): return f"" diff --git a/poetry.lock b/poetry.lock index 32f017a..7af0e03 100644 --- a/poetry.lock +++ b/poetry.lock @@ -219,7 +219,7 @@ python-versions = ">=3.5" [[package]] name = "isort" -version = "5.9.1" +version = "5.9.2" description = "A Python utility / library to sort Python imports." category = "dev" optional = false @@ -317,7 +317,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "regex" -version = "2021.4.4" +version = "2021.7.6" description = "Alternative regular expression module, to replace re." category = "dev" optional = false @@ -519,8 +519,8 @@ idna = [ {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] isort = [ - {file = "isort-5.9.1-py3-none-any.whl", hash = "sha256:8e2c107091cfec7286bc0f68a547d0ba4c094d460b732075b6fba674f1035c0c"}, - {file = "isort-5.9.1.tar.gz", hash = "sha256:83510593e07e433b77bd5bff0f6f607dbafa06d1a89022616f02d8b699cfcd56"}, + {file = "isort-5.9.2-py3-none-any.whl", hash = "sha256:eed17b53c3e7912425579853d078a0832820f023191561fcee9d7cae424e0813"}, + {file = "isort-5.9.2.tar.gz", hash = "sha256:f65ce5bd4cbc6abdfbe29afc2f0245538ab358c14590912df638033f157d555e"}, ] itsdangerous = [ {file = "itsdangerous-2.0.1-py3-none-any.whl", hash = "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c"}, @@ -591,47 +591,47 @@ pyflakes = [ {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, ] regex = [ - {file = "regex-2021.4.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:619d71c59a78b84d7f18891fe914446d07edd48dc8328c8e149cbe0929b4e000"}, - {file = "regex-2021.4.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:47bf5bf60cf04d72bf6055ae5927a0bd9016096bf3d742fa50d9bf9f45aa0711"}, - {file = "regex-2021.4.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:281d2fd05555079448537fe108d79eb031b403dac622621c78944c235f3fcf11"}, - {file = "regex-2021.4.4-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:bd28bc2e3a772acbb07787c6308e00d9626ff89e3bfcdebe87fa5afbfdedf968"}, - {file = "regex-2021.4.4-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:7c2a1af393fcc09e898beba5dd59196edaa3116191cc7257f9224beaed3e1aa0"}, - {file = "regex-2021.4.4-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:c38c71df845e2aabb7fb0b920d11a1b5ac8526005e533a8920aea97efb8ec6a4"}, - {file = "regex-2021.4.4-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:96fcd1888ab4d03adfc9303a7b3c0bd78c5412b2bfbe76db5b56d9eae004907a"}, - {file = "regex-2021.4.4-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:ade17eb5d643b7fead300a1641e9f45401c98eee23763e9ed66a43f92f20b4a7"}, - {file = "regex-2021.4.4-cp36-cp36m-win32.whl", hash = "sha256:e8e5b509d5c2ff12f8418006d5a90e9436766133b564db0abaec92fd27fcee29"}, - {file = "regex-2021.4.4-cp36-cp36m-win_amd64.whl", hash = "sha256:11d773d75fa650cd36f68d7ca936e3c7afaae41b863b8c387a22aaa78d3c5c79"}, - {file = "regex-2021.4.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d3029c340cfbb3ac0a71798100ccc13b97dddf373a4ae56b6a72cf70dfd53bc8"}, - {file = "regex-2021.4.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:18c071c3eb09c30a264879f0d310d37fe5d3a3111662438889ae2eb6fc570c31"}, - {file = "regex-2021.4.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:4c557a7b470908b1712fe27fb1ef20772b78079808c87d20a90d051660b1d69a"}, - {file = "regex-2021.4.4-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:01afaf2ec48e196ba91b37451aa353cb7eda77efe518e481707e0515025f0cd5"}, - {file = "regex-2021.4.4-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:3a9cd17e6e5c7eb328517969e0cb0c3d31fd329298dd0c04af99ebf42e904f82"}, - {file = "regex-2021.4.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:90f11ff637fe8798933fb29f5ae1148c978cccb0452005bf4c69e13db951e765"}, - {file = "regex-2021.4.4-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:919859aa909429fb5aa9cf8807f6045592c85ef56fdd30a9a3747e513db2536e"}, - {file = "regex-2021.4.4-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:339456e7d8c06dd36a22e451d58ef72cef293112b559010db3d054d5560ef439"}, - {file = "regex-2021.4.4-cp37-cp37m-win32.whl", hash = "sha256:67bdb9702427ceddc6ef3dc382455e90f785af4c13d495f9626861763ee13f9d"}, - {file = "regex-2021.4.4-cp37-cp37m-win_amd64.whl", hash = "sha256:32e65442138b7b76dd8173ffa2cf67356b7bc1768851dded39a7a13bf9223da3"}, - {file = "regex-2021.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1e1c20e29358165242928c2de1482fb2cf4ea54a6a6dea2bd7a0e0d8ee321500"}, - {file = "regex-2021.4.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:314d66636c494ed9c148a42731b3834496cc9a2c4251b1661e40936814542b14"}, - {file = "regex-2021.4.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6d1b01031dedf2503631d0903cb563743f397ccaf6607a5e3b19a3d76fc10480"}, - {file = "regex-2021.4.4-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:741a9647fcf2e45f3a1cf0e24f5e17febf3efe8d4ba1281dcc3aa0459ef424dc"}, - {file = "regex-2021.4.4-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:4c46e22a0933dd783467cf32b3516299fb98cfebd895817d685130cc50cd1093"}, - {file = "regex-2021.4.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:e512d8ef5ad7b898cdb2d8ee1cb09a8339e4f8be706d27eaa180c2f177248a10"}, - {file = "regex-2021.4.4-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:980d7be47c84979d9136328d882f67ec5e50008681d94ecc8afa8a65ed1f4a6f"}, - {file = "regex-2021.4.4-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ce15b6d103daff8e9fee13cf7f0add05245a05d866e73926c358e871221eae87"}, - {file = "regex-2021.4.4-cp38-cp38-win32.whl", hash = "sha256:a91aa8619b23b79bcbeb37abe286f2f408d2f2d6f29a17237afda55bb54e7aac"}, - {file = "regex-2021.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:c0502c0fadef0d23b128605d69b58edb2c681c25d44574fc673b0e52dce71ee2"}, - {file = "regex-2021.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:598585c9f0af8374c28edd609eb291b5726d7cbce16be6a8b95aa074d252ee17"}, - {file = "regex-2021.4.4-cp39-cp39-manylinux1_i686.whl", hash = "sha256:ee54ff27bf0afaf4c3b3a62bcd016c12c3fdb4ec4f413391a90bd38bc3624605"}, - {file = "regex-2021.4.4-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7d9884d86dd4dd489e981d94a65cd30d6f07203d90e98f6f657f05170f6324c9"}, - {file = "regex-2021.4.4-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:bf5824bfac591ddb2c1f0a5f4ab72da28994548c708d2191e3b87dd207eb3ad7"}, - {file = "regex-2021.4.4-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:563085e55b0d4fb8f746f6a335893bda5c2cef43b2f0258fe1020ab1dd874df8"}, - {file = "regex-2021.4.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:b9c3db21af35e3b3c05764461b262d6f05bbca08a71a7849fd79d47ba7bc33ed"}, - {file = "regex-2021.4.4-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:3916d08be28a1149fb97f7728fca1f7c15d309a9f9682d89d79db75d5e52091c"}, - {file = "regex-2021.4.4-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:fd45ff9293d9274c5008a2054ecef86a9bfe819a67c7be1afb65e69b405b3042"}, - {file = "regex-2021.4.4-cp39-cp39-win32.whl", hash = "sha256:fa4537fb4a98fe8fde99626e4681cc644bdcf2a795038533f9f711513a862ae6"}, - {file = "regex-2021.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:97f29f57d5b84e73fbaf99ab3e26134e6687348e95ef6b48cfd2c06807005a07"}, - {file = "regex-2021.4.4.tar.gz", hash = "sha256:52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb"}, + {file = "regex-2021.7.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e6a1e5ca97d411a461041d057348e578dc344ecd2add3555aedba3b408c9f874"}, + {file = "regex-2021.7.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:6afe6a627888c9a6cfbb603d1d017ce204cebd589d66e0703309b8048c3b0854"}, + {file = "regex-2021.7.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:ccb3d2190476d00414aab36cca453e4596e8f70a206e2aa8db3d495a109153d2"}, + {file = "regex-2021.7.6-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:ed693137a9187052fc46eedfafdcb74e09917166362af4cc4fddc3b31560e93d"}, + {file = "regex-2021.7.6-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:99d8ab206a5270c1002bfcf25c51bf329ca951e5a169f3b43214fdda1f0b5f0d"}, + {file = "regex-2021.7.6-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:b85ac458354165405c8a84725de7bbd07b00d9f72c31a60ffbf96bb38d3e25fa"}, + {file = "regex-2021.7.6-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:3f5716923d3d0bfb27048242a6e0f14eecdb2e2a7fac47eda1d055288595f222"}, + {file = "regex-2021.7.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5983c19d0beb6af88cb4d47afb92d96751fb3fa1784d8785b1cdf14c6519407"}, + {file = "regex-2021.7.6-cp36-cp36m-win32.whl", hash = "sha256:c92831dac113a6e0ab28bc98f33781383fe294df1a2c3dfd1e850114da35fd5b"}, + {file = "regex-2021.7.6-cp36-cp36m-win_amd64.whl", hash = "sha256:791aa1b300e5b6e5d597c37c346fb4d66422178566bbb426dd87eaae475053fb"}, + {file = "regex-2021.7.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:59506c6e8bd9306cd8a41511e32d16d5d1194110b8cfe5a11d102d8b63cf945d"}, + {file = "regex-2021.7.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:564a4c8a29435d1f2256ba247a0315325ea63335508ad8ed938a4f14c4116a5d"}, + {file = "regex-2021.7.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:59c00bb8dd8775473cbfb967925ad2c3ecc8886b3b2d0c90a8e2707e06c743f0"}, + {file = "regex-2021.7.6-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:9a854b916806c7e3b40e6616ac9e85d3cdb7649d9e6590653deb5b341a736cec"}, + {file = "regex-2021.7.6-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:db2b7df831c3187a37f3bb80ec095f249fa276dbe09abd3d35297fc250385694"}, + {file = "regex-2021.7.6-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:173bc44ff95bc1e96398c38f3629d86fa72e539c79900283afa895694229fe6a"}, + {file = "regex-2021.7.6-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:15dddb19823f5147e7517bb12635b3c82e6f2a3a6b696cc3e321522e8b9308ad"}, + {file = "regex-2021.7.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2ddeabc7652024803666ea09f32dd1ed40a0579b6fbb2a213eba590683025895"}, + {file = "regex-2021.7.6-cp37-cp37m-win32.whl", hash = "sha256:f080248b3e029d052bf74a897b9d74cfb7643537fbde97fe8225a6467fb559b5"}, + {file = "regex-2021.7.6-cp37-cp37m-win_amd64.whl", hash = "sha256:d8bbce0c96462dbceaa7ac4a7dfbbee92745b801b24bce10a98d2f2b1ea9432f"}, + {file = "regex-2021.7.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:edd1a68f79b89b0c57339bce297ad5d5ffcc6ae7e1afdb10f1947706ed066c9c"}, + {file = "regex-2021.7.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:422dec1e7cbb2efbbe50e3f1de36b82906def93ed48da12d1714cabcd993d7f0"}, + {file = "regex-2021.7.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cbe23b323988a04c3e5b0c387fe3f8f363bf06c0680daf775875d979e376bd26"}, + {file = "regex-2021.7.6-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:0eb2c6e0fcec5e0f1d3bcc1133556563222a2ffd2211945d7b1480c1b1a42a6f"}, + {file = "regex-2021.7.6-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:1c78780bf46d620ff4fff40728f98b8afd8b8e35c3efd638c7df67be2d5cddbf"}, + {file = "regex-2021.7.6-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:bc84fb254a875a9f66616ed4538542fb7965db6356f3df571d783f7c8d256edd"}, + {file = "regex-2021.7.6-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:598c0a79b4b851b922f504f9f39a863d83ebdfff787261a5ed061c21e67dd761"}, + {file = "regex-2021.7.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:875c355360d0f8d3d827e462b29ea7682bf52327d500a4f837e934e9e4656068"}, + {file = "regex-2021.7.6-cp38-cp38-win32.whl", hash = "sha256:e586f448df2bbc37dfadccdb7ccd125c62b4348cb90c10840d695592aa1b29e0"}, + {file = "regex-2021.7.6-cp38-cp38-win_amd64.whl", hash = "sha256:2fe5e71e11a54e3355fa272137d521a40aace5d937d08b494bed4529964c19c4"}, + {file = "regex-2021.7.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6110bab7eab6566492618540c70edd4d2a18f40ca1d51d704f1d81c52d245026"}, + {file = "regex-2021.7.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:4f64fc59fd5b10557f6cd0937e1597af022ad9b27d454e182485f1db3008f417"}, + {file = "regex-2021.7.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:89e5528803566af4df368df2d6f503c84fbfb8249e6631c7b025fe23e6bd0cde"}, + {file = "regex-2021.7.6-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:2366fe0479ca0e9afa534174faa2beae87847d208d457d200183f28c74eaea59"}, + {file = "regex-2021.7.6-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:f9392a4555f3e4cb45310a65b403d86b589adc773898c25a39184b1ba4db8985"}, + {file = "regex-2021.7.6-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:2bceeb491b38225b1fee4517107b8491ba54fba77cf22a12e996d96a3c55613d"}, + {file = "regex-2021.7.6-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:f98dc35ab9a749276f1a4a38ab3e0e2ba1662ce710f6530f5b0a6656f1c32b58"}, + {file = "regex-2021.7.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:319eb2a8d0888fa6f1d9177705f341bc9455a2c8aca130016e52c7fe8d6c37a3"}, + {file = "regex-2021.7.6-cp39-cp39-win32.whl", hash = "sha256:eaf58b9e30e0e546cdc3ac06cf9165a1ca5b3de8221e9df679416ca667972035"}, + {file = "regex-2021.7.6-cp39-cp39-win_amd64.whl", hash = "sha256:4c9c3155fe74269f61e27617529b7f09552fbb12e44b1189cebbdb24294e6e1c"}, + {file = "regex-2021.7.6.tar.gz", hash = "sha256:8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d"}, ] rope = [ {file = "rope-0.19.0.tar.gz", hash = "sha256:64e6d747532e1f5c8009ec5aae3e5523a5bcedf516f39a750d57d8ed749d90da"}, diff --git a/testDB.py b/testDB.py index 1703aba..e6b04de 100644 --- a/testDB.py +++ b/testDB.py @@ -44,8 +44,8 @@ with app.app_context(): db.session.add(ps3) ex1 = Experiment( - number=1, - name="exp", + label="B1", + title="exp", room="123", building="phy", responsibility="none", @@ -56,8 +56,8 @@ with app.app_context(): ) ex2 = Experiment( - number=2, - name="exp2", + label="B2", + title="exp2", room="123", building="phy", responsibility="none",