ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity
897 Commits 3 Branches 1 Tag 19 MiB
Commit Graph

353 Commits

Author SHA1 Message Date
Ramon Wenger 89961dc301 Add statistics basics 2019-02-10 22:54:34 +01:00
Ramon Wenger e9bee08c1d Add statistics module 2019-02-10 18:04:07 +01:00
Ramon Wenger ea7a306522 Add solution toggling to frontend 2019-02-07 16:58:20 +01:00
Ramon Wenger 4b93b410a5 Add mutation to enable solutions by module 2019-02-05 18:45:03 +01:00
Ramon Wenger a08be83283 Add styling to solution 2019-02-04 18:09:51 +01:00
Ramon Wenger 92d2901f9e Add solution type to server 2019-02-04 15:19:27 +01:00
Ramon Wenger 050f700760 Add basics for cypress tests in pipelines file 2019-01-31 16:47:07 +01:00
Ramon Wenger 460d413196 Add owner to form for assignment creation 2018-12-05 18:13:31 +01:00
Ramon Wenger f235d50424 Add assignment as a snippet 2018-12-05 15:07:25 +01:00
Ramon Wenger ca96676e5c Add assignments to cms admin 2018-12-04 16:23:50 +01:00
Ramon Wenger 59efba9179 Filter content block by user created attribute 2018-12-04 13:32:11 +01:00
Ramon Wenger bcb3e5e719 Merge branch 'feature/objectives-created-by-user' 2018-11-21 15:19:44 +01:00
Ramon Wenger 7fd7728712 Add mutation to server 2018-11-21 14:57:36 +01:00
Ramon Wenger a1fd28b48e Add objective group mutation 2018-11-20 17:28:29 +01:00
Ramon Wenger 876a22c4ad Adjust test to run on pipelines 2018-11-20 09:13:37 +01:00
Ramon Wenger 7a09621a01 Add some logging 2018-11-13 19:04:34 +01:00
Ramon Wenger 90f980fe09 Remove subtitle from room entry 2018-11-01 16:18:35 +01:00
Ramon Wenger 62bd0b2435 Restrict deletion of rooms to teachers 2018-11-01 15:25:40 +01:00
Ramon Wenger f28c1c8eab Limit objective progress to logged in user 2018-11-01 14:22:58 +01:00
Ramon Wenger d372905d7b Restrict objective groups for students 2018-11-01 10:57:45 +01:00
Ramon Wenger 6e5b829ea1 Fix dummy data 2018-11-01 10:56:28 +01:00
Ramon Wenger 53f50bdc13 Add mutations for objective group visibility 2018-10-31 15:35:58 +01:00
Ramon Wenger a437620f13 Update dummy data 2018-10-31 15:34:30 +01:00
Ramon Wenger 9b6207f192 Change title in objective group model 2018-10-30 23:31:54 +01:00
Ramon Wenger 12f343e8e7 Remove basic knowledge from dummy data for now 2018-10-30 17:53:13 +01:00
Ramon Wenger 457fc0d505 Fix Postgres version in docker files 2018-10-30 17:52:00 +01:00
Ramon Wenger 5b50e497c9 Add room entry edit mask 2018-10-30 11:57:41 +01:00
Ramon Wenger c536a04122 Add parts for room entry deletion 2018-10-29 18:54:34 +01:00
Ramon Wenger 3416465f8a Add string representation to student submission 2018-10-25 17:08:38 +02:00
Ramon Wenger 0ab58b7582 Fix disappearing submission bug for student 2018-10-25 15:46:31 +02:00
Ramon Wenger adfd328e85 Only display final submissions to teacher 2018-10-25 15:45:17 +02:00
Ramon Wenger e23dc4a9f0 Refactor code 2018-10-25 15:06:35 +02:00
Ramon Wenger 3ab8e9e8bb Add migration 2018-10-25 13:56:19 +02:00
Ramon Wenger 106d90ed17 Add basic knowledge page to content block 2018-10-25 13:54:49 +02:00
Ramon Wenger 7044ccb1b9 Add basic knowledge queries on server 2018-10-25 12:30:17 +02:00
Ramon Wenger 1cd31eb95a Add basic knowledge model and admin 2018-10-25 11:05:59 +02:00
Ramon Wenger 4ad67a09b3 Add author to room entry 2018-10-24 15:34:52 +02:00
Ramon Wenger ee8e33e026 Remove role from GQL query 2018-10-24 15:16:31 +02:00
Ramon Wenger a90501d7e8 Clean up some more code 2018-10-24 15:15:48 +02:00
Christian Cueni 1591095553 Prevent students from adding new rooms, Verify room form 2018-10-24 08:40:30 +02:00
Christian Cueni d80abf5b09 Prevent backend from changing a block’s type 2018-10-23 10:43:32 +02:00
Christian Cueni 93ad822457 Add logout functionality 
Remove unused imports

Add file header

Check response

remove file headers
 2018-10-23 08:20:25 +02:00
Ramon Wenger f16e4db625 Fix bug in room creation 2018-10-22 20:08:34 +02:00
Ramon Wenger ec908e6b7a Fix typo 2018-10-22 19:23:50 +02:00
Christian Cueni 033372848e Merged in feature/detailpage (pull request #5) 
Feature/detailpage

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2018-10-22 17:22:38 +00:00
Ramon Wenger c5750a199b Extend user admin 2018-10-22 19:01:20 +02:00
Christian Cueni d7aa98e3e3 Add basic pages & queries for single submissions 2018-10-22 13:33:47 +02:00
Ramon Wenger 004ad8ca57 Limit rooms for regular user to their classes 2018-10-19 11:16:41 +02:00
Ramon Wenger 2e4255260b Add hero image to module teasers 2018-10-19 10:57:07 +02:00
Ramon Wenger febed9adc4 Fetch topic information from API 2018-10-19 10:36:31 +02:00
Ramon Wenger 181a06424a Remove `filteredbook` app 2018-10-18 20:05:10 +02:00
Christian Cueni 7a2f8c91e4 Filter user created blocks based on classes 2018-10-18 16:59:28 +02:00
Ramon Wenger 90dac6b7e5 Merge branch 'feature/custom-assignments-to-user-created' 2018-10-18 16:30:43 +02:00
Ramon Wenger 9edbcf3d56 Add custom assignment test base 2018-10-18 16:28:06 +02:00
Ramon Wenger b6f85183ae Fix unit test 2018-10-18 14:46:22 +02:00
Ramon Wenger c6a4efe267 Fix spelling 2018-10-18 14:30:37 +02:00
Ramon Wenger 5daeefbcec Remove custom assignments, add `user created` flag 2018-10-18 10:02:02 +02:00
Ramon Wenger 13717c1371 Fix assignment creation 2018-10-18 10:00:03 +02:00
Ramon Wenger 543ce6a464 Fix unit tests 2018-10-17 15:53:46 +02:00
Ramon Wenger 7e88642918 Remove order property from module 2018-10-17 15:48:14 +02:00
Ramon Wenger 20ff1f8137 Fix migrations 2018-10-17 14:59:09 +02:00
Christian Cueni 13a9812ba0 Merged in feature/colors (pull request #3) 
Feature/colors

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
 2018-10-17 12:34:16 +00:00
Christian Cueni c6ca532633 fix tüpflischiiser 2018-10-17 13:19:01 +02:00
Christian Cueni 0adaedafb6 fix unit tests 2018-10-16 15:54:40 +02:00
Christian Cueni d67f41f32b remove logger 2018-10-16 15:32:16 +02:00
Ramon Wenger a4479727ce Add another unit test 2018-10-16 13:52:40 +02:00
Ramon Wenger 5218a3a867 Limit submissions to teacher of student's class 2018-10-16 13:36:32 +02:00
Christian Cueni 3547a30228 allow user to set block type 2018-10-16 07:29:41 +02:00
Ramon Wenger 8dc5d7dfaf Add initial tests for assignment 2018-10-15 20:08:32 +02:00
Ramon Wenger 0f5d9f80af Remove school model, refactor code 2018-10-15 15:03:25 +02:00
Christian Cueni a1a75e9b3f rename types of Contentblocks, change box appearance 2018-10-15 14:10:24 +02:00
Ramon Wenger 72cab13b36 Add default users 2018-10-15 13:54:34 +02:00
Ramon Wenger e1deb19ca8 Re-do all migrations 2018-10-11 15:47:12 +02:00
Ramon Wenger 9e1c0cd39b Merge remote-tracking branch 'origin/feature/objective-control' 2018-10-11 15:44:27 +02:00
Ramon Wenger 55683da3ed Fix Unit Tests 2018-10-11 14:56:11 +02:00
Christian Cueni 5dd77eab5d use cache for update, incorperate feedback 2018-10-11 14:12:47 +02:00
Ramon Wenger 3d0c9e4b93 Render room entry dynamically on article view 2018-10-11 14:09:09 +02:00
Ramon Wenger ce86e45743 Add content block deletion mutation 2018-10-11 11:39:50 +02:00
Ramon Wenger eafff751f8 Filter content blocks by permission and ownership 2018-10-10 14:18:15 +02:00
Christian Cueni 5970ac3427 update objective progress items 2018-10-10 10:45:56 +02:00
Ramon Wenger 645c998d5c Add 'user created' property on user created content blocks 2018-10-10 10:34:30 +02:00
Ramon Wenger 9fed2b8422 Rename folder user to users 2018-10-10 09:40:24 +02:00
Ramon Wenger 8110ee359f Distinguish between default and user created content blocks in cms admin 2018-10-09 17:42:19 +02:00
Ramon Wenger f75b04b82f Add active state on submissions link 2018-10-08 16:55:39 +02:00
Ramon Wenger 6e75b55475 Improve navigation styling 2018-10-08 15:32:25 +02:00
Ramon Wenger 6f15ac4173 Fix bug in role retrieval 2018-10-08 14:35:57 +02:00
Ramon Wenger b1e44ef263 Rename rooms query 2018-10-08 14:34:56 +02:00
Ramon Wenger 2adfffd441 Add role to user query 2018-10-08 11:34:04 +02:00
Ramon Wenger d970f75fa4 Refactor school class naming 2018-10-08 10:52:55 +02:00
Daniel Egger 9efd000aa1 Refactored from method to computed 2018-10-06 16:26:38 +02:00
Daniel Egger bd4a9fded3 Show ContentBlock actions only with the right permission 2018-10-05 14:11:00 +02:00
Daniel Egger f3bcea7528 Refactored VisibilityPopover for new SchoolClass 2018-10-05 11:51:41 +02:00
Daniel Egger d273d711c1 Renamed UserGroup to SchoolClass step 2 2018-10-05 11:25:05 +02:00
Daniel Egger b2cac389cf Renamed UserGroup to SchoolClass and reset migrations 2018-10-05 10:59:57 +02:00
Daniel Egger 21c85941be Show the name of the logged in user in DefaultLayout 2018-10-05 10:49:12 +02:00
Daniel Egger 31c22846f6 Added DEFAULT_SCHOOL_ID 
The DEFAULT_SCHOOL_ID is used as long as we have only one school.
That simplifies some code for now.
 2018-10-04 22:15:36 +02:00
Daniel Egger 1574b8fbcc Added GraphQL "me" query to get user permissions 2018-10-04 22:10:31 +02:00
Daniel Egger 6a57b35251 Added SchoolRole models from Helloclass 2018-10-04 16:00:21 +02:00
Ramon Wenger ba18946736 Fix tests 2018-10-04 15:57:56 +02:00
Ramon Wenger b9bb41e8cc Add module to assignment 2018-10-04 15:29:45 +02:00
Ramon Wenger e524fe6107 Update factory to include image URL block generation 2018-10-04 13:51:18 +02:00
Daniel Egger 8811829e3a Bugfix for Bitbucket-Pipelines tests 2018-10-04 12:52:56 +02:00
Daniel Egger 35201e6986 Fix Python import error 2018-10-04 10:32:44 +02:00
Daniel Egger a5e58fb3fc Added Authentication for GraphQL api endpoint. Added tests 2018-10-04 10:27:49 +02:00
Ramon Wenger 7a91d9ce77 Rename book to books and reset migrations 2018-10-04 10:05:14 +02:00
Ramon Wenger e425122455 Add description to chapter 2018-10-03 18:48:31 +02:00
Daniel Egger 8420d8aab1 upload documents in user assignment 2018-10-02 18:04:08 +02:00
Daniel Egger b870c4b35c StudentSubmission should have URL as document 2018-10-02 18:04:08 +02:00
Daniel Egger e1756300be assignement admin 2018-10-02 18:04:08 +02:00
Ramon Wenger 6ba06e9fe9 Update dummy data and factories 2018-10-02 18:02:52 +02:00
Ramon Wenger 3752ba5c1d Add new dummy data and improve factories 2018-10-02 16:13:36 +02:00
Ramon Wenger e52a98c50b Divide updates for assignment submissions 2018-10-02 14:28:38 +02:00
Ramon Wenger 73759e1af8 Fix dummy data for basic knowledge 2018-10-02 14:27:55 +02:00
Ramon Wenger b22b918d82 Add final submission for assignment 2018-10-02 13:16:50 +02:00
Ramon Wenger 0612daa05f Fix error for user without existing submission 2018-10-02 13:16:29 +02:00
Ramon Wenger d35c151cfb Add assignment query on server 2018-10-02 10:07:36 +02:00
Ramon Wenger 107b5735e9 Add assignment mutation on server side 2018-10-01 13:44:29 +02:00
Ramon Wenger 23176088f4 Fix factory for assignment 2018-10-01 13:42:10 +02:00
Ramon Wenger f5e163c3cd Clean up module query 2018-10-01 13:08:20 +02:00
Ramon Wenger 6f9666407c Fix dummy data 2018-10-01 13:05:53 +02:00
Ramon Wenger 8f7f8e4d4f Add assignment handling on API 2018-09-27 16:07:48 +02:00
Ramon Wenger 826849f1e0 Add assignment app 2018-09-27 11:50:37 +02:00
Ramon Wenger 65d50f686c Fix image block in front-end 2018-09-27 11:50:37 +02:00
Pawel Kowalski 4eb8406b2c Prepare settings and fix urls for aws s3 usage 2018-09-26 16:31:07 +02:00
Ramon Wenger cb0f96f81e Add "add room entry" mutation with serializer 2018-09-25 17:01:16 +02:00
Ramon Wenger 5b8eb36cbb Add user group to room form 2018-09-24 17:04:57 +02:00
Ramon Wenger 9a89fa874b Add 'allowed blocks' property for room entry 2018-09-24 17:02:57 +02:00
Ramon Wenger 7a6f6ff6e8 Add functionality to room delete button 2018-09-21 15:24:52 +02:00
Ramon Wenger 643374140e Update room dummy data 2018-09-21 13:46:08 +02:00
Ramon Wenger dea1d1b253 Add room update mutation on server 2018-09-21 13:45:51 +02:00
Ramon Wenger 613f099b30 Rename arguments for mutations 2018-09-21 13:03:34 +02:00
Daniel Egger 2e8dc96046 bitbucket pipelines heroku integration 2018-09-20 17:28:15 +02:00
Ramon Wenger b37038f74d Split up add and change mutations for rooms 2018-09-20 16:21:36 +02:00
Ramon Wenger 66ad787779 Generalize room mutation using serializer 2018-09-20 16:03:42 +02:00
Ramon Wenger 83ebaa94b9 Change login mask style 2018-09-20 16:02:25 +02:00
Pawel Kowalski 3223dccb2a Add assets dir to staticfiles 2018-09-20 11:39:31 +02:00
Ramon Wenger c8937243f5 Change content block mutation 2018-09-20 10:29:05 +02:00
Daniel Egger 48e724f4e4 anpassungen nach rebase 2018-09-19 17:40:53 +02:00
Daniel Egger b8b09b1af3 example with uploadcare 2018-09-19 16:37:27 +02:00
Ramon Wenger ef48f5afb6 Add content block edit modal 
Also clean up the state store.
Also change the properties of the content block contents on the server
 2018-09-19 15:40:21 +02:00
Ramon Wenger 2464c97079 Update dummy data types 2018-09-18 19:38:26 +02:00
Ramon Wenger db61ca560a Add room mutation to frontend 2018-09-17 18:56:24 +02:00
Ramon Wenger 1927244f26 Fix room querying 2018-09-17 17:53:14 +02:00
Ramon Wenger fe59a65e87 Add room mutation 2018-09-17 11:35:49 +02:00
Ramon Wenger 0e30f0bd45 Add new room page 2018-09-14 15:57:57 +02:00
Ramon Wenger 7038721bfd Toggle visibility by class / user group 2018-09-13 15:27:22 +02:00
Daniel Egger 4a964b3e81 example mutate hidden/visibility userGroup <-> contentBlock 2018-09-13 12:05:37 +02:00
Pawel Kowalski 2ad89ce6ef Example Visibility server side filtering 2018-09-13 11:44:31 +02:00
Pawel Kowalski 2ead4f221b Added hidden_for ManyToMany 2018-09-13 10:20:20 +02:00
Ramon Wenger 639fa7665c Add document block 2018-09-12 15:05:36 +02:00