Commit Graph

297 Commits (master)

Author SHA1 Message Date
fish 454d3062c3 Update Script.php
邀请前检查该student_id是否已存在
2020-05-20 17:50:16 +08:00
fish 099d0e0445 Update Header.php
添加jquery-ui.css和jquery-ui.js的1.12.1版本
2020-05-20 13:49:46 +08:00
fish 47b5f09110 Update Script.php
修改Script.php文件中的connection为本地root连接
2020-05-20 13:46:35 +08:00
Software Project Management e8de77a243
Merge pull request #37 from lanlab-org/Hui-improve-README.md
Fixing typos and grammatical errors
2020-05-11 17:04:41 +08:00
TanakaMichelle dcef721576
Fixing typos and grammatical errors
Fixed some tying errors as well as grammatical errors.

Tanaka Michelle Sandati (201732120134)
Yeboah Martha Asamoah (201732120135)
Tamene Robel (201732120170)
2020-05-10 09:41:09 +08:00
Software Project Management faffd9ec6b
Merge pull request #35 from lanlab-org/TwizerePacifique-201925800174-ContributorList2
README.md : Added my team information
2020-04-27 16:43:58 +08:00
Will Concord ff37ea37cf Readme.md: Added my team information 2020-04-27 14:07:36 +08:00
Software Project Management 9f6cb780ec
Merge pull request #34 from lanlab-org/MaryAkussah-201925800173-Contributorlist2
README.md: Mary and Kumson.
2020-04-27 12:21:05 +08:00
Mary-Ak 3a56312521 README.md: Mary and Kumson. 2020-04-26 16:53:19 +08:00
Software Project Management ec80d4c6b0
Merge pull request #33 from lanlab-org/Hui-bugfix-65
Hui bugfix 65 "Students unable to submit assignment after a recent change"
2020-04-23 10:22:25 +08:00
Hui Lan a89b8f4e0d Script.php: why use the function trim? 2020-04-23 10:10:58 +08:00
Hui Lan b7d6ae1bcf Script.php: [bugfix] fix -- "Students unable to submit assignment after a recent change"
This commit temporarily fixed the bug reported at http://118.25.96.118/bugzilla/show_bug.cgi?id=65

This bug was introduced after a recent functionality addition, i.e., allowing Lecturer to edit assignment information.
See the following pull request for details.
https://github.com/lanlab-org/LRR/pull/21

It seems that $group_id is not properly assigned after merging the above pull request.
Therefore, when someone tried to insert a record to the database table lab_report_submissions, he encountered a running error.

In this fix, I just set $group_id 0 to avoid the database insertion error.
This is OK when an assignment is of type Individual.
Of course, this fix is not ideal, as it cannot handle the situation where the assignment is of type Group.
In the future, $group_id must be properly initialized, depending on the assignment type.

-Hui
2020-04-21 20:48:13 +08:00
Hui Lan 18f2e7023a Courses.php: change info_Updated to info_updated. PHP usually uses camelCase as its naming convention. In that case, there should be no underscore between info and Updated. 2020-04-20 20:11:40 +08:00
Hui Lan be86db36e9 Courses.php: fix typo Successfull. 2020-04-20 20:07:04 +08:00
Software Project Management 058eb2adac
Merge pull request #21 from lanlab-org/Ashly-Tafadzwa-Dhani-201632120150-Contributor_List
Allowing all group member to submit assignment and allowing Lecturer to edit assignment info.
2020-04-18 17:49:48 +08:00
CloudStarTreck 2a6ed869ff Updating Course_id variable
In the input form of Posting New Lab assignment in COurse.php, the COurse_id variable was converted from int to a char string by adding dots around the variable. This caused a 44440 upload error since the column can only hold integers.
2020-04-18 17:30:40 +08:00
Software Project Management 53ec7c848e
Merge pull request #30 from lanlab-org/Dai-JsCssLocal
Link js css files to local. -Dai
2020-04-17 22:40:30 +08:00
和user.email 674ba53cfd Link js css files to local. -Dai 2020-04-17 22:20:28 +08:00
CloudStarTreck 29ad8f4499 Regression Test Failure with 4441 Upload Error
Following the previous update, the system failed a regression test and reported a 4441 error while trying to submit a new Lab report.
This was due to the condition added on line 298 in Course.php and reversing this change solved the problem.

This condition was added to allow all Group members to be updated once the Tutor Marks the Lab Report but a better method to
archieve this has been implemented on line 367 in Course.php
2020-04-16 14:46:43 +08:00
Software Project Management 9386f08eab
Merge pull request #28 from lanlab-org/Hui-FontAweSome
Header.php: Use a local font-awesome/css/font-awesome.min.css instead
2020-04-16 11:21:31 +08:00
Hui Lan 8624e5511f Header.php: Use a local font-awesome/css/font-awesome.min.css instead of a remote one from https://cdnjs.cloudflare.com 2020-04-15 12:09:26 +08:00
Teecloudy a16781ff6f
Merge pull request #22 from lanlab-org/GuedaliaYouma-201925800221-ContributorList
README.md: added personal information, Guedalia Youma - 201925800221,…
2020-04-10 08:59:30 +08:00
Guedalia Youma 155e318302 README.md: added personal information, Guedalia Youma - 201925800221, Corneille-201925800168, Dorcas-201925800170 2020-04-09 13:07:55 +08:00
CloudStarTreck f894e79de1 Editing report by Instructor
In the previous update, the form for editing assignments by instructor was failing to retrieve <textarea> Now its working fine. (Line 171 Courses.php)
2020-04-08 10:05:17 +08:00
Software Project Management 8f7191061d
Merge pull request #14 from lanlab-org/SamanthaRusike-201632120140-Contributor-List
created branch and added names to contributer list
2020-04-07 14:14:06 +08:00
Teecloudy 5c085a271b
Merge branch 'master' into SamanthaRusike-201632120140-Contributor-List 2020-04-07 01:19:48 +08:00
CloudStarTreck c47f5c14dd SamanthaRusike-201632120140-Contributor_List
Ashly Tafadzwa Dhani 201632120150
Samantha Rusike 201632120140
2020-04-07 01:17:18 +08:00
CloudStarTreck 25f9b4ff0f Allowing all group member to submit assignment and allowing Lecture to Edit Assignments
Two Issues have been Fixed

1)Firstly
Only Group Admins were able to submit group assignments and the system was indicating to other members that they missed the deadline.

This Problems was solved through the following stages:

Create 4 new columns 'Member_ID1-4 Varchar(50) DEFAULT 0' in the database table 'course_group_table' (this will limit each group to max 5 members you can check the file Script.php from line 1071.)

Changing the SQL query in SubmitLab.php to allow both Group Member and Group Admin to submit assignment. (However for this feature to take effect with backward compat, the group admin might need to invite other members again into the group or else they still wont be able to submit but all the group assignments will indicate that they have been submitted by the admin. For any new group after the update it works perfect.)

Changing the Course.php allows other members to be updated once 1 member submit the assignment.

2)Secondly
The Tutor couldnt modify assignments once posted.

Adding an 'Edit' Button on the Tutor's page allows him to modify new and old assignment without any duplications. This feature afftected Courses.php from line 109.

Group
Ashly Tafadzwa Dhani 201632120150
Samantha Rusike 201632120140
2020-04-06 23:45:30 +08:00
Software Project Management 4e2e7f96bb
Merge pull request #15 from lanlab-org/YeHantao-201732120125-ContributorList
Ye hantao 201732120125 contributor list
2020-04-06 23:14:48 +08:00
wkytz 294f473e8f
Update README.md 2020-04-06 23:13:15 +08:00
Software Project Management 11d4aa8586
Merge pull request #20 from lanlab-org/master
update by Ye Hangtao
2020-04-06 23:09:33 +08:00
wkytz 150d4de569
Update README.md 2020-04-06 22:38:37 +08:00
wkytz 3370688164
Update README.md 2020-04-06 22:27:43 +08:00
wkytz 0e9025fa64
Update README.md 2020-04-06 22:26:08 +08:00
Software Project Management 025999381e
Merge pull request #16 from lanlab-org/zhangbin-201732120127-ContributorList
Update README.md by

- Benny123-cell - ZhangBin - 201732120127

- 421281726 - LiJiaxing - 201732120118

- zhenghongyu-david - ZhengHongyu - 201732120128
2020-04-06 19:38:34 +08:00
Benny123-cell 5d1e364fdc
Update README.md 2020-04-06 18:24:15 +08:00
samrusike 10a2b4f9d8 created branch and added names to contributer list 2020-04-06 04:01:14 +08:00
wkytz 93d5392748
Update README.md 2020-04-05 22:13:09 +08:00
wkytz 40814f1b8a
Update README.md 2020-04-05 22:12:37 +08:00
Teecloudy ac7fdbaef8
Merge pull request #12 from lanlab-org/Hui-improve-README.md
Hui improved README.md
2020-03-31 22:48:03 +08:00
Hui Lan 0d79b8923f README.md: add a new line in the end of README.md. 2020-03-31 22:16:12 +08:00
Hui Lan 643fd0eac1 Merge branch 'master' of https://github.com/lanlab-org/LRR into Hui-improve-README.md 2020-03-31 22:15:13 +08:00
Software Project Management 452ea2da0e
Merge pull request #11 from lanlab-org/ZhengXiaoyu-201732120110-ContributorList
Zheng Xiaoyu added her information.
2020-03-31 22:14:12 +08:00
Hui Lan ce4194e63b README.md: update The Feature-branching Workflow. 2020-03-31 22:11:54 +08:00
Hui Lan 42d392a164 README.md: update the section How to Contribute. 2020-03-31 22:11:13 +08:00
Hui Lan 29375b2c5f README.md: complete list of TODO's. 2020-03-31 22:09:04 +08:00
Hui Lan 8bbbf5b3f7 README.md: we use Bugzilla. 2020-03-31 22:08:11 +08:00
Hui Lan 17f9195827 README.md: link to a tutorial on how to use IRC. 2020-03-31 22:07:02 +08:00
Hui Lan d812b738c1 README.md: method -> Method. 2020-03-31 22:05:38 +08:00
Hui Lan 02d70e9b6e README.md: rearrange two subsections: Communications method and The Feature-branching Workflow. 2020-03-31 22:05:23 +08:00