From 441382cc07c17f57bd92b06ff8f8b9d9f92cc9f7 Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Tue, 1 Mar 2016 19:55:28 -0800 Subject: [PATCH 001/256] Update findphrase.php --- corpus/findphrase.php | 68 ++++++++++--------------------------------- 1 file changed, 15 insertions(+), 53 deletions(-) diff --git a/corpus/findphrase.php b/corpus/findphrase.php index 108944c..f6012d3 100644 --- a/corpus/findphrase.php +++ b/corpus/findphrase.php @@ -1,56 +1,18 @@ connectDB(); - if(!empty($conn)) { - $this->selectDB($conn); - } - } - - function connectDB() { - $conn = mysql_connect($this->host,$this->user,$this->password); - return $conn; - } - - function selectDB($conn) { - mysql_select_db($this->database,$conn); - } - - function runQuery($query) { - $result = mysql_query($query); - while($row=mysql_fetch_assoc($result)) { - $resultset[] = $row; - } - if(!empty($resultset)) - return $resultset; - } - - function numRows($query) { - $result = mysql_query($query); - $rowcount = mysql_num_rows($result); - return $rowcount; - } +if (isset($_POST['search'])) { + $search = htmlentities($_POST['search']); + +$db = mysql_connect('us-cdbr-azure-west-c.cloudapp.net','b2a3214e88e413','325ebc40'); //Don't forget to change +mysql_select_db('mysqldbproject', $db); //theses parameters +$sql = "SELECT expression from expressions_full WHERE expression LIKE '$search%'"; +$req = mysql_query($sql) or die(); +echo ''; +mysql_close(); +exit; } ?> - -runQuery($query); -if(!empty($result)) { -?> - - From e75cb9bc928acbff2a9006fe1d7dcb448ccd239d Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Tue, 1 Mar 2016 19:55:35 -0800 Subject: [PATCH 002/256] Update findphraseAC.php --- findphraseAC.php | 120 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 38 deletions(-) diff --git a/findphraseAC.php b/findphraseAC.php index 2eb5496..e6e77b8 100644 --- a/findphraseAC.php +++ b/findphraseAC.php @@ -1,45 +1,89 @@ -jQuery AJAX Autocomplete - Country Example - - - - + + - -
- -
-
- +
+
+ + +
+
+
From 61d9ce4ebc74ef3a445f4a375a737c1c6ca174d6 Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Tue, 1 Mar 2016 20:11:55 -0800 Subject: [PATCH 003/256] Update findphrase.php --- corpus/findphrase.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/corpus/findphrase.php b/corpus/findphrase.php index f6012d3..98db8ac 100644 --- a/corpus/findphrase.php +++ b/corpus/findphrase.php @@ -2,17 +2,22 @@ if (isset($_POST['search'])) { $search = htmlentities($_POST['search']); -$db = mysql_connect('us-cdbr-azure-west-c.cloudapp.net','b2a3214e88e413','325ebc40'); //Don't forget to change -mysql_select_db('mysqldbproject', $db); //theses parameters -$sql = "SELECT expression from expressions_full WHERE expression LIKE '$search%'"; -$req = mysql_query($sql) or die(); +$con = mysqli_connect('us-cdbr-azure-west-c.cloudapp.net','b2a3214e88e413','325ebc40','mysqldbproject'); +if (!$con) { + die('Could not connect: ' . mysqli_error($con)); +} + +//Search results for echo ($q); +mysqli_select_db($con,"mysqldbproject"); +$sql= "SELECT * FROM expressions_full WHERE expression LIKE '$search%'"; +$req = mysqli_query($con,$sql) or die(); echo ''; -mysql_close(); +mysqli_close($con); exit; } ?> From e389706c6dac687098b1f867f78c3f832e2f6be8 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Wed, 2 Mar 2016 13:11:15 -0800 Subject: [PATCH 004/256] Fixing login script --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index d405153..54220dc 100644 --- a/index.php +++ b/index.php @@ -69,7 +69,7 @@ $username = $_POST['username']; $password = md5($_POST['password'] . $salt); $loginquery = " -SELECT SU.[user_id],SU.[username],SU.[password],SU.[first_name],SU.[last_name],SU.[email],SU.[date_added], R.[Role] +SELECT SU.[user_id],SU.[username],SU.[password],SU.[date_added], R.[Role] FROM SiteUsers as SU, RoleInstances as RI, Roles as R WHERE SU.username = ? AND SU.[password] = ? AND From 659c3961b592e785d3780359ec0cb97bac14c998 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Wed, 2 Mar 2016 13:12:24 -0800 Subject: [PATCH 005/256] Fixing change (for real this time) --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 54220dc..69496fa 100644 --- a/index.php +++ b/index.php @@ -69,7 +69,7 @@ $username = $_POST['username']; $password = md5($_POST['password'] . $salt); $loginquery = " -SELECT SU.[user_id],SU.[username],SU.[password],SU.[date_added], R.[Role] +SELECT DISTINCT SU.[user_id],SU.[username],SU.[password],SU.[date_added], R.[Role] FROM SiteUsers as SU, RoleInstances as RI, Roles as R WHERE SU.username = ? AND SU.[password] = ? AND From d0fd2444bd193014de1415b6b05df16bf7a3a41f Mon Sep 17 00:00:00 2001 From: Menezes Date: Wed, 2 Mar 2016 16:00:05 -0800 Subject: [PATCH 006/256] Worksheet Editor works now --- .../ViewCourse/ViewWorksheet/index.php | 2 +- .../ViewCourse/WorksheetEditor/index.php | 102 +++++++++++++----- 2 files changed, 75 insertions(+), 29 deletions(-) diff --git a/teacher/MyCourses/ViewCourse/ViewWorksheet/index.php b/teacher/MyCourses/ViewCourse/ViewWorksheet/index.php index 8bd86d8..06fb23a 100644 --- a/teacher/MyCourses/ViewCourse/ViewWorksheet/index.php +++ b/teacher/MyCourses/ViewCourse/ViewWorksheet/index.php @@ -43,7 +43,7 @@

You do not have permission to view this page. Redirecting in 5 seconds

diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php index 4a46d62..290ab0f 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -19,6 +19,9 @@ + + + + - - - -

You do not have permission to view this page. Redirecting in 5 seconds

-

Click here if you don't want to wait

- - - - -
- -
-
-
-
- -
-
Course Listing (sort by most recent)
- -
- - -
- -
- - - - - - - - - - - - - - 'static' ); - $query = " SELECT CN.[Course #], TC.[Section], A.[Advisor], Y.[Year], S.[Session], TC.[Teachers&ClassesID], TC.[Instructor] - FROM [Teachers&Classes] as TC, [Advisor] as A, [Class Names] as CN, [Session] as S, [Sessions] as Ss, [Year] as Y - WHERE TC.[ClassNamesID] = CN.[ClassNamesID] AND - TC.[Instructor] = A.[ID] AND - TC.[SessionID] = Ss.[SessionsID] AND - TC.[Teachers&ClassesID] in (SELECT [Teachers&ClassesID] from Expressions) AND - Y.[ID] = Ss.[Year_ID] AND - S.[ID] = Ss.[Session_ID] - ORDER BY Y.[Year] desc"; - $stmt = sqlsrv_query($con, $query, $params, $options); - if ( !$stmt ) - die( print_r( sqlsrv_errors(), true)); - - /* Extract Pagination Paramaters */ - - $rowsPerPage = isset($_GET['pp']) ? $_GET['pp'] : 10; // get rows per page, default = 10 - - - $rowsReturned = sqlsrv_num_rows($stmt); - if($rowsReturned === false) - die(print_r( sqlsrv_errors(), true)); - elseif($rowsReturned == 0) - { - echo "No rows returned."; - exit(); - } - else - { - /* Calculate number of pages. */ - $numOfPages = ceil($rowsReturned/$rowsPerPage); - } - - /* Echo results to the page */ - $pageNum = isset($_GET['pageNum']) ? $_GET['pageNum'] : 1; - $page = Pagination::getPage($stmt, $pageNum, $rowsPerPage); - foreach($page as $row) - { - $coursePageLink = "ViewCourse/?courseID=$row[5]"; - echo ""; - } - - echo "
CourseSectionInstructorYearSessionCourse Page
$row[0]$row[1]$row[2]$row[3]$row[4]Course Page

"; - $modulator = 3; - Pagination::pageLinks($numOfPages, $pageNum, $rowsPerPage, $rowsReturned, $modulator); - ?> - -
-
- -
-
-
-
-
- - - - - - - -

Oops! You are not logged in. Redirecting to log-in in 5 seconds

-

Click here if you don't want to wait

- - - - diff --git a/admin/Archive/Courses/ViewCourse/ViewWorksheet/index.php b/admin/Archive/Courses/ViewCourse/ViewWorksheet/index.php index 500f396..9783830 100644 --- a/admin/Archive/Courses/ViewCourse/ViewWorksheet/index.php +++ b/admin/Archive/Courses/ViewCourse/ViewWorksheet/index.php @@ -14,6 +14,7 @@ + @@ -27,16 +28,7 @@ }); - - + -
-
+
-
-
Documentation
+
+
+ Course Details +
-

Main course (archived) view for admin/teacher. Will contain list/links to worksheets, students, and the teacher

-

This top section will contain general information about a given course (teacher, level, etc)

+ 'static'); + $courseInfoQuery = " + SELECT TC.CoursesID, CN.ClassName, TC.Section, T.FirstName, T.LastName, SN.SessionName, I.InstitutionName + FROM TeachersCourses as TC, [Class Names] as CN, Teachers as T, Sessions as Ss, SessionNames as SN, Institutions as I + WHERE TC.CoursesID = ? AND + CN.ClassNamesID = TC.ClassNamesID AND + T.TeacherID = TC.InstructorID AND + Ss.SessionsID = TC.SessionID AND + SN.SessionsID = Ss.SessionsID"; + $stmt = sqlsrv_query( $con, $courseInfoQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($stmt) === true) + { + $ClassName = sqlsrv_get_field($stmt, 1); + $Section = sqlsrv_get_field($stmt, 2); + $FirstName = sqlsrv_get_field($stmt, 3); + $LastName = sqlsrv_get_field($stmt, 4); + $Session = sqlsrv_get_field($stmt, 5); + $Institution = sqlsrv_get_field($stmt, 6); + + + } + echo "

Class Name: $ClassName

Section: $Section

Teacher: $FirstName $LastName

Session: $Session

Hosting Institution: $Institution

"; + + + + + ?>
+ + +
+
+
+
+ Worksheet Details +
+
+ 'static'); + $worksheetInfoQuery = " + SELECT DISTINCT [TO].Topic, LEFT(CONVERT(VARCHAR, E.Date, 120), 10) + FROM Expressions as E, Topics as [TO] + WHERE E.[Teachers&ClassesID] = ? AND + E.[Worksheet#] = ? AND + [TO].Topic_ID = E.[Topic_ID] AND + E.Date = (SELECT min(Date) FROM Expressions WHERE [Teachers&ClassesID] = ? AND [Worksheet#] = ?)"; + $stmt = sqlsrv_query( $con, $worksheetInfoQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($stmt) === true) + { + $topic = sqlsrv_get_field($stmt, 0); + $date = sqlsrv_get_field($stmt, 1); + } + echo "

Topic: $topic

Date: $date"; + ?> +

+
+ +
+
+
+
Worksheet display
@@ -103,22 +161,22 @@ Sentence Number Student - Citizenship Expression Context/Vocab + Pronunciation 'static' ); $query = - "SELECT E.[Sentence number], S.[LastName], C.Country, E.Expression, E.[Context/Vocabulary], E.Student_ID + "SELECT E.[Sentence number], S.[LastName], E.Expression, E.[Context/Vocabulary], E.[Pronunciation], E.Student_ID FROM Expressions as E, Students as S, Country as C - WHERE E.[Teachers&ClassesID] = $courseID AND - E.[Worksheet#] = $worksheetNum AND + WHERE E.[Teachers&ClassesID] = ? AND + E.[Worksheet#] = ? AND S.ID = E.Student_ID AND C.ID = S.Citizenship ORDER BY [Sentence number]"; @@ -154,7 +212,6 @@
-
diff --git a/admin/Archive/Courses/ViewCourse/index.php b/admin/Archive/Courses/ViewCourse/index.php index ac2d57f..912e83c 100644 --- a/admin/Archive/Courses/ViewCourse/index.php +++ b/admin/Archive/Courses/ViewCourse/index.php @@ -14,6 +14,7 @@ + @@ -27,16 +28,7 @@ }); - - + -
-
- -
-
- +
+ +
+
+
-
Documentation
+
Course Info
-

Main course (archived) view for admin/teacher. Will contain list/links to worksheets, students, and the teacher

-

This top section will contain general information about a given course (teacher, level, etc)

+ 'static'); + $courseInfoQuery = " + SELECT TC.CoursesID, CN.ClassName, TC.Section, T.FirstName, T.LastName, SN.SessionName, I.InstitutionName + FROM TeachersCourses as TC, [Class Names] as CN, Teachers as T, Sessions as Ss, SessionNames as SN, Institutions as I + WHERE TC.CoursesID = ? AND + CN.ClassNamesID = TC.ClassNamesID AND + T.TeacherID = TC.InstructorID AND + Ss.SessionsID = TC.SessionID AND + SN.SessionsID = Ss.SessionsID"; + $stmt = sqlsrv_query($con, $courseInfoQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($stmt) === true) + { + $ClassName = sqlsrv_get_field($stmt, 1); + $Section = sqlsrv_get_field($stmt, 2); + $FirstName = sqlsrv_get_field($stmt, 3); + $LastName = sqlsrv_get_field($stmt, 4); + $Session = sqlsrv_get_field($stmt, 5); + $Institution = sqlsrv_get_field($stmt, 6); + + } + echo "

Class Name: $ClassName

Section: $Section

Teacher: $FirstName $LastName

Session: $Session

Hosting Institution: $Institution

"; + + + ?> +
+ + +
+
Worksheet display
@@ -87,6 +110,7 @@ Worksheet Number Link to worksheet page + Annotate this worksheet @@ -117,7 +141,8 @@ foreach($page as $row) { $worksheetPageLink = "ViewWorksheet/?courseID=$row[1]&worksheetNum=$row[0]"; - echo "$row[0]Worksheet Page"; + $annotationPageLink = "ViewWorksheet/AnnotationEditor/?courseID=$row[1]&worksheetNum=$row[0]"; + echo "$row[0]Worksheet PageAnnotation Editor"; } ?> @@ -128,7 +153,6 @@
-
diff --git a/admin/Archive/Courses/index.php b/admin/Archive/Courses/index.php index f5260ca..72ca223 100644 --- a/admin/Archive/Courses/index.php +++ b/admin/Archive/Courses/index.php @@ -14,6 +14,8 @@ + + @@ -28,15 +30,7 @@ - + -
-
+
+
Search for a course
@@ -98,7 +92,7 @@
-
+
@@ -152,7 +146,8 @@ foreach($page as $row) { $coursePageLink = "ViewCourse/?courseID=$row[4]"; - echo ""; + $teacherPageLink = "/Admin/Archive/Teachers/ViewTeacher/?tid=$row[5]"; + echo ""; } echo "
$row[0]$row[1]$row[2]$row[3]Course Page
$row[0]$row[1]$row[2]$row[3]Course Page

"; diff --git a/admin/Archive/Students/index.php b/admin/Archive/Students/index.php index d9f48d8..5825411 100644 --- a/admin/Archive/Students/index.php +++ b/admin/Archive/Students/index.php @@ -14,6 +14,8 @@ + + @@ -27,16 +29,6 @@ }); - - -
-
-
-
- +
+
+
+
-
Student Search
+
Filter Results
-

This window will have a search interface for looking up students in the DB.

+
+
+
+ +
+
+ +
-
+
+
+ +
Course Listing (sort by most recent)
@@ -81,6 +83,7 @@
    +
  • 10
  • 50
  • 100
  • 200
    • @@ -94,8 +97,7 @@ First Name Last Name - Citizenship - + Language Link to Student's Page @@ -109,12 +111,12 @@ $params = array(); $options = array( "Scrollable" => 'static' ); $query = -"SELECT S.[FirstName], S.[LastName], C.[Country], S.[ID], COUNT(DISTINCT E.[Teachers&ClassesID]) -FROM Students as S, Country as C, Expressions as E -WHERE C.[ID] = S.[Citizenship] AND +"SELECT S.[FirstName], S.[LastName], L.[Language], S.[ID], COUNT(DISTINCT E.[Teachers&ClassesID]) +FROM Students as S, Expressions as E, Languages as L +WHERE L.[LanguageID] = S.[Language] AND S.[ID] in (SELECT DISTINCT ES.Student_ID FROM Expressions as ES) AND E.[Student_ID] = S.[ID] -GROUP BY S.[FirstName], S.[LastName], C.[Country], S.[ID]"; +GROUP BY S.[FirstName], S.[LastName], S.[ID], L.Language"; $stmt = sqlsrv_query($con, $query, $params, $options); if ( !$stmt ) die( print_r( sqlsrv_errors(), true)); @@ -145,7 +147,7 @@ } echo "
    "; - $modulator = 2; + $modulator = 4; Pagination::pageLinks($numOfPages, $pageNum, $rowsPerPage, $rowsReturned, $modulator); ?> diff --git a/admin/Archive/Teachers/ViewTeacher/index.php b/admin/Archive/Teachers/ViewTeacher/index.php index a232ff4..c40772c 100644 --- a/admin/Archive/Teachers/ViewTeacher/index.php +++ b/admin/Archive/Teachers/ViewTeacher/index.php @@ -14,6 +14,8 @@ + + @@ -27,16 +29,6 @@ }); - - -
    -
    -
    -
    - +
    +
    +
    +
    Teacher Information
    @@ -90,17 +82,7 @@ } - $institutionsQuery = "SELECT I.InstitutionName - FROM Teachers as T, TeachingInstance as TI, Institutions as I - WHERE T.TeacherID = ? AND - TI.SiteUsername = T.SiteUsername AND - I.InstitutionID = TI.InstitutionID"; - $stmt = sqlsrv_query( $con, $institutionsQuery, $params, $options); - if ($stmt === false) - die(print_r(sqlsrv_errors(), true)); - $institutions = []; - while( sqlsrv_fetch($stmt) === true) - $institutions[] = sqlsrv_get_field( $stmt, 0); + $firstYearRangeQuery = " SELECT min(Y.Year) @@ -132,13 +114,53 @@ echo "

    Name: $firstName $lastName

    "; echo "

    Active with Smalltalk from: $firstYear - $lastYear

    "; - echo "

    Institutions:

    "; - foreach($institutions as $inst) - echo "

    $inst

    "; ?>
    + + +
    +
    +
    +
    + Active Institutions +
    +
    + 'static'); + $institutionsQuery = "SELECT I.InstitutionName + FROM Teachers as T, TeachingInstance as TI, Institutions as I + WHERE T.TeacherID = ? AND + TI.SiteUsername = T.SiteUsername AND + I.InstitutionID = TI.InstitutionID"; + $stmt = sqlsrv_query( $con, $institutionsQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + $institutions = []; + while( sqlsrv_fetch($stmt) === true) + $institutions[] = sqlsrv_get_field( $stmt, 0); + ?> + +
    + + + $institution"; + ?> + + +
    +
    +
    + + +
    +
    +
    +
    Teacher's Course Listing (sort by most recent)
    @@ -206,7 +228,6 @@
    -
    diff --git a/admin/Archive/Teachers/index.php b/admin/Archive/Teachers/index.php index 047e3b6..da8a385 100644 --- a/admin/Archive/Teachers/index.php +++ b/admin/Archive/Teachers/index.php @@ -14,6 +14,8 @@ + + @@ -27,16 +29,6 @@ }); - - -
    -
    -
    -
    - +
    +
    +
    +
    -
    Teacher Search
    +
    Filter Results
    -

    This window will have a search interface for looking up teachers

    +
    +
    +
    + + +
    + + +
    + +
    +
    +
    Teacher listing (only SmallTalk contributors, listed alphabetically by last name
    @@ -92,6 +96,7 @@ First Name Last Name + Site Username Link to Teacher's Page @@ -102,7 +107,7 @@ $params = array(); $options = array( "Scrollable" => 'static' ); $query = -"SELECT T.[FirstName], T.[LastName], T.[TeacherID] +"SELECT T.[FirstName], T.[LastName], T.SiteUsername, T.[TeacherID] FROM Teachers as T"; $stmt = sqlsrv_query($con, $query, $params, $options); if ( !$stmt ) @@ -129,8 +134,8 @@ $page = Pagination::getPage($stmt, $pageNum, $rowsPerPage); foreach($page as $row) { - $teacherPageLink = "ViewTeacher/?tid=$row[2]"; - echo "$row[0]$row[1]Visit Page"; + $teacherPageLink = "ViewTeacher/?tid=$row[3]"; + echo "$row[0]$row[1]$row[2]Visit Page"; } echo "
    "; diff --git a/admin/Home/Profile/index.php b/admin/Home/Profile/index.php deleted file mode 100644 index c66a686..0000000 --- a/admin/Home/Profile/index.php +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - -

    You do not have permission to view this page. Redirecting in 5 seconds

    -

    Click here if you don't want to wait

    - - - - -
    - -
    -
    -
    -
    - -

    Profile View

    -

    Documentation:

    -

    Displays info about the admin account. TBD

    -
    -
    -
    -
    -
    - - - - - - - - -

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    -

    Click here if you don't want to wait

    - - - - diff --git a/admin/Home/index.php b/admin/Home/index.php index 5465e21..beff355 100644 --- a/admin/Home/index.php +++ b/admin/Home/index.php @@ -12,7 +12,7 @@ - + @@ -26,7 +26,7 @@ - + --> +
    -
    -
    -
    - -

    -

    Admin for

    - - - +
    +
    +
    +
    +
    +

    Administrator Home

    +
    +
    +

    +

    Role: Admin

    +

    Institution:

    +
    +
    +
    +
    +
    +
    +

    All Site Administrators

    +
    +
    + + + + + + + + + + 'static'); + $adminsQuery = " + SELECT I.InstitutionName, A.FirstName, A.LastName, R.Designation + FROM Institutions as I, Administrators as A, RoleInstances as RI, Roles as R + WHERE A.RoleInstanceID = RI.RoleInstanceID AND + RI.RoleID = R.RoleID AND + R.Role = 'Admin' AND + I.InstitutionID = A.InstitutionID"; + $stmt = sqlsrv_query($con, $adminsQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + while (sqlsrv_fetch($stmt) === true) + { + $institution = sqlsrv_get_field($stmt, 0); + $fname = sqlsrv_get_field($stmt, 1); + $lname = sqlsrv_get_field($stmt, 2); + $designation = sqlsrv_get_field($stmt, 3); + + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> + + + + + +
    InstitutionNameDesignation
    $institution$fname $lname$designation
    +
    +
    +
    + +
    +
    +
    +
    +
    +

    Activity Queue

    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    + + + + + + + + + +
    DateAction NameAction TypeUser
    +
    +
    diff --git a/admin/ManageCourses/index.php b/admin/ManageCourses/index.php index b2e4320..a1492f9 100644 --- a/admin/ManageCourses/index.php +++ b/admin/ManageCourses/index.php @@ -13,6 +13,8 @@ + + @@ -26,16 +28,7 @@ }); - - + -
    -
    -
    -
    - -

    Courses Listing

    +
    +
    +
    + +

    Courses

    -
    Documentation
    +
    Add New Course
    -

    Courses view for admin user. Displays list of courses, as well as a button at the top to navigate to CreateCourse. Each element in the list is a link to a ViewCourse page, which submits a form.

    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + + +
    + +
    -
    Documentation
    - - -
    +
    Active Courses
    +
    + + + + + + + + + + + + + + + + + + + +
    InstitutionSession NameCourse Name SectionTeacher Name
    Gonzaga UniversityFall II 2014Advanced...1Hunter
    +
    +
    diff --git a/index.php b/index.php index 69496fa..a6da681 100644 --- a/index.php +++ b/index.php @@ -86,12 +86,10 @@ if(sqlsrv_num_rows($checklogin) == 1) { $row = sqlsrv_fetch_array($checklogin); - $email = $row['email']; $role = $row['Role']; - $first_name = $row['first_name']; - $last_name = $row['last_name']; + echo $role; $_SESSION['Username'] = $username; $_SESSION['LoggedIn'] = 1; $_SESSION['Role'] = $role; @@ -110,6 +108,7 @@ $last_name = sqlsrv_get_field( $stmt, 1); $email = sqlsrv_get_field( $stmt, 2); } + } elseif ($role == 'Teacher') { @@ -125,6 +124,8 @@ $last_name = sqlsrv_get_field( $stmt, 1); $email = sqlsrv_get_field( $stmt, 2); } + else + echo "Teacher...shit"; } elseif ($role == 'Student') { @@ -140,6 +141,8 @@ $last_name = sqlsrv_get_field( $stmt, 1); $email = sqlsrv_get_field( $stmt, 2); } + else + echo "Shit"; } $_SESSION['EmailAddress'] = $email; @@ -148,7 +151,7 @@ - echo ""; + echo ""; } else {?> diff --git a/sidebar.php b/sidebar.php index b3d4b5d..c087c1c 100644 --- a/sidebar.php +++ b/sidebar.php @@ -35,34 +35,17 @@ Admin Home
  • - Manage Courses + Manage Website -
    • -
  • - Manage Teachers - -
    • -
  • - Manage Students - -
    • -
  • - Manage Corpus -
    • +
  • Corpus
    • From b87c689ca7255bdeaf85b9aee595afa76a9e3547 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Wed, 2 Mar 2016 22:49:19 -0800 Subject: [PATCH 008/256] Fixing bug on log-in page --- index.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index a6da681..9c730c7 100644 --- a/index.php +++ b/index.php @@ -141,8 +141,7 @@ $last_name = sqlsrv_get_field( $stmt, 1); $email = sqlsrv_get_field( $stmt, 2); } - else - echo "Shit"; + } $_SESSION['EmailAddress'] = $email; @@ -151,7 +150,7 @@ - echo ""; + echo ""; } else {?> From 21722f88d02665d2ce357245a077dbd769776b60 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Thu, 3 Mar 2016 12:13:36 -0800 Subject: [PATCH 009/256] Testing fix to FLATui navbar - trying to get it to work on Mobile --- teacher/MyCourses/ViewCourse/WorksheetEditor/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php index 290ab0f..ff468e0 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -55,7 +55,9 @@ From 1fc8648b04e5f4ff0943685c475c47d2eb726e6c Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Thu, 3 Mar 2016 12:22:02 -0800 Subject: [PATCH 010/256] Testing fix to FLATui navbar - trying to get it to work on Mobile --- teacher/MyCourses/ViewCourse/WorksheetEditor/index.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php index ff468e0..fd6d3c3 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -227,6 +227,15 @@ + + + + + + + + +

    You do not have permission to view this page. Redirecting in 5 seconds

    +

    Click here if you don't want to wait

    + + "; + else + { + ?> + +
    + +
    +
    + +
    +
    + +
    +
    + Course Details +
    +
    + 'static'); + $courseInfoQuery = " + SELECT TC.CoursesID, CN.ClassName, TC.Section, T.FirstName, T.LastName, SN.SessionName, I.InstitutionName + FROM TeachersCourses as TC, [Class Names] as CN, Teachers as T, Sessions as Ss, SessionNames as SN, Institutions as I + WHERE TC.CoursesID = ? AND + CN.ClassNamesID = TC.ClassNamesID AND + T.TeacherID = TC.InstructorID AND + Ss.SessionsID = TC.SessionID AND + SN.SessionsID = Ss.SessionsID"; + $stmt = sqlsrv_query( $con, $courseInfoQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($stmt) === true) + { + $ClassName = sqlsrv_get_field($stmt, 1); + $Section = sqlsrv_get_field($stmt, 2); + $FirstName = sqlsrv_get_field($stmt, 3); + $LastName = sqlsrv_get_field($stmt, 4); + $Session = sqlsrv_get_field($stmt, 5); + $Institution = sqlsrv_get_field($stmt, 6); + + + } + echo "

    Class Name: $ClassName

    Section: $Section

    Teacher: $FirstName $LastName

    Session: $Session

    Hosting Institution: $Institution

    "; + + + + + ?> + +
    +
    + + +
    +
    +
    +
    + Worksheet Details +
    +
    + 'static'); + $worksheetInfoQuery = " + SELECT DISTINCT [TO].Topic, LEFT(CONVERT(VARCHAR, E.Date, 120), 10) + FROM Expressions as E, Topics as [TO] + WHERE E.[Teachers&ClassesID] = ? AND + E.[Worksheet#] = ? AND + [TO].Topic_ID = E.[Topic_ID] AND + E.Date = (SELECT min(Date) FROM Expressions WHERE [Teachers&ClassesID] = ? AND [Worksheet#] = ?)"; + $stmt = sqlsrv_query( $con, $worksheetInfoQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($stmt) === true) + { + $topic = sqlsrv_get_field($stmt, 0); + $date = sqlsrv_get_field($stmt, 1); + } + echo "

    Topic: $topic

    Date: $date"; + ?> +

    +
    + +
    +
    +
    +
    +
    +
    Worksheet display
    + +
    + + +
    +
    + + + + + + + + + + + + 'static' ); + $query = + "SELECT E.[Sentence number], S.[LastName], E.Expression, E.[Context/Vocabulary], E.[Pronunciation], E.Student_ID + FROM Expressions as E, + Students as S, + Country as C + WHERE E.[Teachers&ClassesID] = ? AND + E.[Worksheet#] = ? AND + S.ID = E.Student_ID AND + C.ID = S.Citizenship + ORDER BY [Sentence number]"; + $stmt = sqlsrv_query($con, $query, $params, $options); + if (!$stmt) + die( print_r( sqlsrv_errors(), true)); + + $rowsPerPage = isset($_GET['pp']) ? $_GET['pp'] : 10; + $rowsReturned = sqlsrv_num_rows($stmt); + if($rowsReturned === false) + die(print_r( sqlsrv_errors(), true)); + elseif($rowsReturned == 0) + { + echo "No rows returned."; + exit(); + } + else + { + $numOfPages = ceil($rowsReturned/$rowsPerPage); + } + + $pageNum = isset($_GET['pageNum']) ? $_GET['pageNum'] : 1; + $page = Pagination::getPage($stmt, $pageNum, $rowsPerPage); + foreach($page as $row) + { + $studentPageLink = "/Admin/Archive/Students/ViewStudent/?studentID=$row[5]"; + echo ""; + } + echo "
    Sentence NumberStudentExpressionContext/VocabPronunciation
    $row[0]$row[1]$row[2]$row[3]$row[4]
    "; + $modulator = 3; + Pagination::pageLinksArchiveWorksheet($numOfPages, $pageNum, $rowsPerPage, $rowsReturned, $modulator, $courseID, $worksheetNum); + ?> + +
    +
    +
    +
    +
    +
    +
    + + + + + + + +

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    +

    Click here if you don't want to wait

    + + + + diff --git a/teacher/MyCourses/ViewCourse/ViewWorksheet/AnnotationEditor/index.php b/teacher/MyCourses/ViewCourse/ViewWorksheet/AnnotationEditor/index.php new file mode 100644 index 0000000..06fb23a --- /dev/null +++ b/teacher/MyCourses/ViewCourse/ViewWorksheet/AnnotationEditor/index.php @@ -0,0 +1,129 @@ + + + + + + + + + + + Gonzaga Small Talk + + + + + + + + + + + + + + + + + +

    You do not have permission to view this page. Redirecting in 5 seconds

    +

    Click here if you don't want to wait

    + + + + + +
    + +
    +
    +
    +
    + + +

    Course Title: Edit Worksheet #_

    + + +
    +
    Worksheet Information
    +
    +

    Topic, level, date

    +
    +
    + + +
    +
    Display Original worksheet expressions
    +
    +

    Sentence number, student, expression, context/vocab

    +
    +
    + + +
    +
    Submissions
    +
    +

    Student(link), date, view submission(link)

    +
    +
    + + +
    +
    +
    +
    +
    + + + + + + + + +

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    +

    Click here if you don't want to wait

    + + + \ No newline at end of file From 6b3b5ee127a4963eed5eb37a404bee4a0f34b744 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Thu, 3 Mar 2016 14:33:53 -0800 Subject: [PATCH 013/256] Further changes to Student, Teacher, and Admin UIs, Changes to Student and Teacher sidebar --- .../index.php | 72 +++++-- admin/ManageCorpus/index.php | 106 ++++++++-- sidebar.php | 89 ++++++-- student/Archive/Courses/index.php | 106 ---------- student/Archive/Expressions/index.php | 106 ---------- student/Archive/Worksheets/index.php | 106 ---------- student/Archive/index.php | 105 ---------- student/home/Profile/index.php | 107 ---------- student/home/index.php | 145 ++++++++++--- teacher/Home/Profile/index.php | 105 ---------- teacher/Home/index.php | 196 +++++++++++++++--- .../MyStudents/ViewStudentProfile/index.php | 2 +- teacher/MyStudents/index.php | 2 +- 13 files changed, 485 insertions(+), 762 deletions(-) rename admin/ManageCorpus/{ReviewChanges => ReviewSubmission}/index.php (52%) delete mode 100644 student/Archive/Courses/index.php delete mode 100644 student/Archive/Expressions/index.php delete mode 100644 student/Archive/Worksheets/index.php delete mode 100644 student/Archive/index.php delete mode 100644 student/home/Profile/index.php delete mode 100644 teacher/Home/Profile/index.php diff --git a/admin/ManageCorpus/ReviewChanges/index.php b/admin/ManageCorpus/ReviewSubmission/index.php similarity index 52% rename from admin/ManageCorpus/ReviewChanges/index.php rename to admin/ManageCorpus/ReviewSubmission/index.php index 19216b8..f673b63 100644 --- a/admin/ManageCorpus/ReviewChanges/index.php +++ b/admin/ManageCorpus/ReviewSubmission/index.php @@ -12,6 +12,8 @@ + + @@ -25,16 +27,7 @@ }); - - + -
    -
    -
    -
    - -

    Manage Corpus

    -

    Documentation:

    -

    Page will manage the transfer of data from the site to the corpus. There will be a listing of requests, submitted by teachers, that the administrator will have the option to review, and then submit to the database. This is how we will manage DB writes. + +

    + + +
    +
    + + +

    +
    +
    +
    +
    +
    +
    +

    Submission to the corpus

    +
    +
    +

    Institution:

    +

    Contributor name:

    +

    Source Class name:

    +

    Worksheet Number:

    +
    +
    + +

    +
    +
    +
    +
    +
    +
    +

    Submitted Expressions

    +
    +
    + + + + + + + + + + +
    Sentence NumberStudent NameExpressionVocab/ContextPronunciation
    +
    +
    +

    diff --git a/admin/ManageCorpus/index.php b/admin/ManageCorpus/index.php index bc04da2..aef87f7 100644 --- a/admin/ManageCorpus/index.php +++ b/admin/ManageCorpus/index.php @@ -12,6 +12,8 @@ + + @@ -25,16 +27,6 @@ }); - - -
    -
    -
    -
    - -

    Manage Corpus

    -

    Home for corpus management. Unique for Gonzaga Admin (James Hunter); for the monitoring of corpus traffic, activity, etc

    +
    +
    +
    +
    +
    +

    Gonzaga Smalltalk Corpus

    +
    +
    +

    Date:

    +

    Total Additions This Month:

    +

    From Gonzaga University This Month:

    +

    Expressions in the Corpus:

    +

    Number of Contributors:

    + +
    +
    +
    + +
    +
    +
    +

    Corpus Administrators

    +
    +
    + + + + + + + + + + + + + + + +
    InstitutionNameRole
    Gonzaga UniversityFname LnameGraduate Student
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Corpus Additions

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DateInstitutionContributorSubmission TitleStatus
    2/20/16GonzagaTeacher NameWorksheet SubmissionApproved
    2/20/16GonzagaTeacher NameWorksheet Submission
    +
    +
    +
    + +
    +

    @@ -80,7 +150,7 @@ diff --git a/sidebar.php b/sidebar.php index 60703bc..1fb1c6f 100644 --- a/sidebar.php +++ b/sidebar.php @@ -21,21 +21,22 @@ SQLSRV_CURSOR_KEYSET); + $ListRolesQuery = "SELECT DISTINCT R.Role, RI.RoleID FROM Roles as R, RoleInstances as RI WHERE RI.SiteUsername = ? AND RI.RoleID = R.RoleID ORDER BY RI.RoleID"; + $stmt = sqlsrv_query($con, $ListRolesQuery, $params, $options); + if( $stmt === false ) { + die( print_r( sqlsrv_errors(), true)); + } + + // Make the first (and in this case, only) row of the result set available for reading. + $RolesList = []; + while( sqlsrv_fetch( $stmt ) === true) { + $RolesList[] = sqlsrv_get_field( $stmt, 0); + } if($_SESSION['Role'] == 'Admin') { - $params = array($_SESSION['Username']); - $options = array( "Scrollable" => SQLSRV_CURSOR_KEYSET); - $ListRolesQuery = "SELECT DISTINCT R.Role, RI.RoleID FROM Roles as R, RoleInstances as RI WHERE RI.SiteUsername = ? AND RI.RoleID = R.RoleID ORDER BY RI.RoleID"; - $stmt = sqlsrv_query($con, $ListRolesQuery, $params, $options); - if( $stmt === false ) { - die( print_r( sqlsrv_errors(), true)); - } - - // Make the first (and in this case, only) row of the result set available for reading. - $RolesList = []; - while( sqlsrv_fetch( $stmt ) === true) { - $RolesList[] = sqlsrv_get_field( $stmt, 0); - } + ?>
    @@ -168,23 +169,58 @@ diff --git a/student/Archive/Courses/index.php b/student/Archive/Courses/index.php deleted file mode 100644 index 1d82f49..0000000 --- a/student/Archive/Courses/index.php +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - - -

    You do not have permission to view this page. Redirecting in 5 seconds

    -

    Click here if you don't want to wait

    - - - - - -
    - -
    -
    -
    -
    - - -

    Search Courses

    -

    Archive (search courses) access for student user. Provides a window with search functionality for searching all non-active courses for a given student ID.

    - - -
    -
    -
    -
    -
    - - - - - - - - - -

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    -

    Click here if you don't want to wait

    - - - diff --git a/student/Archive/Expressions/index.php b/student/Archive/Expressions/index.php deleted file mode 100644 index ecd56db..0000000 --- a/student/Archive/Expressions/index.php +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - - -

    You do not have permission to view this page. Redirecting in 5 seconds

    -

    Click here if you don't want to wait

    - - - - - -
    - -
    -
    -
    -
    - - -

    Search Expressions

    -

    Archive (search expressions) access for student user. Provides a window with search functionality for searching all previously entered expressions for a given student ID.

    - - -
    -
    -
    -
    -
    - - - - - - - - - -

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    -

    Click here if you don't want to wait

    - - - diff --git a/student/Archive/Worksheets/index.php b/student/Archive/Worksheets/index.php deleted file mode 100644 index 5e76dea..0000000 --- a/student/Archive/Worksheets/index.php +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - - -

    You do not have permission to view this page. Redirecting in 5 seconds

    -

    Click here if you don't want to wait

    - - - - - -
    - -
    -
    -
    -
    - - -

    Search Worksheets

    -

    Archive (search worksheets) access for student user. Provides a window with search functionality for searching all previously submitted worksheets for a given student ID.

    - - -
    -
    -
    -
    -
    - - - - - - - - - -

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    -

    Click here if you don't want to wait

    - - - diff --git a/student/Archive/index.php b/student/Archive/index.php deleted file mode 100644 index 7019c33..0000000 --- a/student/Archive/index.php +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - - -

    You do not have permission to view this page. Redirecting in 5 seconds

    -

    Click here if you don't want to wait

    - - - - - -
    - -
    -
    -
    -
    - - -

    Student Name: Archive

    -

    Archive access home for student user. Through this page, the student will be able to view all non-active courses, and therefore review his/her progress. Links will be provided in the Archive Sidebar for navigation to different sections of the Archive, including courses, worksheets, and expressions (search functionality included in each)

    - - -
    -
    -
    -
    -
    - - - - - - - - -

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    -

    Click here if you don't want to wait

    - - - \ No newline at end of file diff --git a/student/home/Profile/index.php b/student/home/Profile/index.php deleted file mode 100644 index a250ded..0000000 --- a/student/home/Profile/index.php +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - - -

    You do not have permission to view this page. Redirecting in 5 seconds

    -

    Click here if you don't want to wait

    - - - - - -
    - -
    -
    -
    -
    - - -

    Documentation:

    -

    Page will provide the student user the ability to review one's own profile. In the first form, this will include contact information and active courses. In the advanced form, this will include progress track and graphical representation of progress.

    -

    Standard student sidebar

    -

    Standard header navigation bar

    - - -
    -
    -
    -
    -
    - - - - - - - - -

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    -

    Click here if you don't want to wait

    - - - \ No newline at end of file diff --git a/student/home/index.php b/student/home/index.php index 69b542f..23cff81 100644 --- a/student/home/index.php +++ b/student/home/index.php @@ -14,7 +14,9 @@ - + + + @@ -27,16 +29,7 @@ }); - - + - - - -
    - -
    -
    -
    -
    - - -

    -

    Page provides student user home. Eventual content will be a site activity queue, listing all relevant course postings by teachers.

    -

    Sidebar will include student navigation: Home, Courses {Worksheets}, My Archive {courses {worksheets}}

    -

    Nav bar will include basic account access (same regardless of role)

    - + { $username = $_SESSION['Username']; + $role = $_SESSION['Role']; + $params = array( $username, $username); + $options = array( "Scrollable" => 'static' ); + $UserInfoQuery = " + SELECT R.Designation, I.InstitutionName + FROM RoleInstances as RI, Roles as R, Administrators as A, Institutions as I + WHERE RI.SiteUsername = ? AND + R.RoleID = RI.RoleID AND + R.Role = 'Admin' AND + A.SiteUsername = ? AND + I.InstitutionID = A.InstitutionID"; + $stmt = sqlsrv_query($con, $UserInfoQuery, $params, $options); + if ( $stmt === false) + die( print_r( sqlsrv_errors(), true)); + $Designation = ""; + $Institution = ""; + if ( sqlsrv_fetch( $stmt ) === true) + { + $Designation = sqlsrv_get_field( $stmt, 0); + $Institution = sqlsrv_get_field( $stmt, 1); + } + ?> + + +
    + +
    + +
    +
    +
    +
    +
    +

    Student Home

    +
    +
    +

    +

    Role: Student

    +

    Institution:

    +
    +
    +
    +
    +
    +
    +

    My Courses

    +
    +
    + + + + + + + + + + + + + + +
    Course NameTeacherSession
    +
    +
    +
    + +
    +
    +
    +
    +
    +

    My Activity Queue

    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    DateCourse NameAction TypeStatusLink
    2/1/2016101 ANew Worksheet PostedIncomplete
    +
    +
    +
    +
    -
    diff --git a/teacher/Home/Profile/index.php b/teacher/Home/Profile/index.php deleted file mode 100644 index 354d032..0000000 --- a/teacher/Home/Profile/index.php +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - - -

    You do not have permission to view this page. Redirecting in 5 seconds

    -

    Click here if you don't want to wait

    - - - - - -
    - -
    -
    -
    -
    - - -

    Documentation:

    -

    Provides Teacher user with view of own profile, for reviewing purposes.

    - -
    -
    -
    -
    -
    - - - - - - - - -

    Oops! You are not logged in. Redirecting to log-in in 5 seconds

    -

    Click here if you don't want to wait

    - - - diff --git a/teacher/Home/index.php b/teacher/Home/index.php index 8444b99..155956d 100644 --- a/teacher/Home/index.php +++ b/teacher/Home/index.php @@ -14,6 +14,8 @@ + + @@ -27,16 +29,6 @@ }); - - - - - -
    - -
    -
    -
    -
    - - -

    -

    Page provides teacher user home. Eventual content will be a site activity queue, listing all relevant course events from students.

    - + {$username = $_SESSION['Username']; + $role = $_SESSION['Role']; + $params = array( $username, $username); + $options = array( "Scrollable" => 'static' ); + $UserInfoQuery = " + SELECT R.Designation, I.InstitutionName + FROM RoleInstances as RI, Roles as R, Administrators as A, Institutions as I + WHERE RI.SiteUsername = ? AND + R.RoleID = RI.RoleID AND + R.Role = 'Admin' AND + A.SiteUsername = ? AND + I.InstitutionID = A.InstitutionID"; + $stmt = sqlsrv_query($con, $UserInfoQuery, $params, $options); + if ( $stmt === false) + die( print_r( sqlsrv_errors(), true)); + $Designation = ""; + $Institution = ""; + if ( sqlsrv_fetch( $stmt ) === true) + { + $Designation = sqlsrv_get_field( $stmt, 0); + $Institution = sqlsrv_get_field( $stmt, 1); + } + ?> + + +
    + +
    + +
    +
    +
    +
    +
    +

    Teacher Home

    +
    +
    +

    +

    Role: Teacher

    +

    Institution:

    +
    +
    +
    +
    +
    +
    +

    My Students

    +
    +
    + + + + + + + + + + 'static'); + $adminsQuery = " + SELECT T.FirstName, T.LastName + FROM Institutions as I, Teachers as T, RoleInstances as RI, Roles as R + WHERE A.RoleInstanceID = RI.RoleInstanceID AND + RI.RoleID = R.RoleID AND + R.Role = 'Teacher' AND + + I.InstitutionID = T.InstitutionID"; + $stmt = sqlsrv_query($con, $adminsQuery, $params, $options); + if ($stmt === false) + die(print_r(sqlsrv_errors(), true)); + while (sqlsrv_fetch($stmt) === true) + { + $institution = sqlsrv_get_field($stmt, 0); + $fname = sqlsrv_get_field($stmt, 1); + $lname = sqlsrv_get_field($stmt, 2); + $designation = sqlsrv_get_field($stmt, 3); + + echo ""; + echo ""; + echo ""; + echo ""; + }*/ + ?> + + + + + +
    InstitutionNameReview Student
    $institution$fname $lname$designation
    +
    +
    +
    + +
    +
    +
    +
    +
    +

    My Site Activity Queue

    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    DateInstitutionCourseAction TypeUser
    1/28/2016Gonzaga UniversitySeminar: Spring I 2016Worksheet SubmissionStudent Name
    +
    +
    +
    +
    -
    diff --git a/teacher/MyStudents/ViewStudentProfile/index.php b/teacher/MyStudents/ViewStudentProfile/index.php index d8009a6..5ae2ea1 100644 --- a/teacher/MyStudents/ViewStudentProfile/index.php +++ b/teacher/MyStudents/ViewStudentProfile/index.php @@ -43,7 +43,7 @@

    You do not have permission to view this page. Redirecting in 5 seconds

    diff --git a/teacher/MyStudents/index.php b/teacher/MyStudents/index.php index 88bba36..c7dcde3 100644 --- a/teacher/MyStudents/index.php +++ b/teacher/MyStudents/index.php @@ -43,7 +43,7 @@

    You do not have permission to view this page. Redirecting in 5 seconds

    From 0264f2af91a4bb0439890611aa51612a490116c1 Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 17:31:32 -0800 Subject: [PATCH 014/256] Update Testfindphrase.html --- corpus/Testfindphrase.html | 99 ++++++++++++++++++++++++++++++++------ 1 file changed, 83 insertions(+), 16 deletions(-) diff --git a/corpus/Testfindphrase.html b/corpus/Testfindphrase.html index d20267b..f6d8f67 100644 --- a/corpus/Testfindphrase.html +++ b/corpus/Testfindphrase.html @@ -1,22 +1,89 @@ + + + - -
    -Please enter a phrase : (ex. I will)
    - - -
    +
    +
    + + +
    +
    - From 73f8a9685e0d1447a4f6d46e5b90caede0bd276f Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 17:54:27 -0800 Subject: [PATCH 015/256] Update Testfindphrase.html --- corpus/Testfindphrase.html | 168 ++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/corpus/Testfindphrase.html b/corpus/Testfindphrase.html index f6d8f67..245c41a 100644 --- a/corpus/Testfindphrase.html +++ b/corpus/Testfindphrase.html @@ -1,89 +1,89 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
    -
    - - -
    -
    + + + + + + - + From c547d099c1921503b8d6514e1f574946a3c3a05f Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 17:55:52 -0800 Subject: [PATCH 016/256] Update Testfindphrase.html --- corpus/Testfindphrase.html | 168 ++++++++++++++++++------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/corpus/Testfindphrase.html b/corpus/Testfindphrase.html index 245c41a..f6d8f67 100644 --- a/corpus/Testfindphrase.html +++ b/corpus/Testfindphrase.html @@ -1,89 +1,89 @@ - - - + + +--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + } +} +function selected(choice){ + var cible = document.getElementById('s'); + cible.value = choice; + document.getElementById('tag_update').style.display = "none"; +} + + + - - - - - - +
    +
    + + +
    +
    - + From 4a5136282b2a73eb2bc0a63d6ef04994d1ea808e Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 18:09:22 -0800 Subject: [PATCH 017/256] Update Testfindphrase.php --- corpus/Testfindphrase.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/corpus/Testfindphrase.php b/corpus/Testfindphrase.php index 5f3d7b5..9f7a04d 100644 --- a/corpus/Testfindphrase.php +++ b/corpus/Testfindphrase.php @@ -40,15 +40,15 @@ //echo ($sql); //Tests the sql statement $result = mysqli_query($con,$sql); //Create table template -echo " - - - - - - - -"; +// echo "
    Search Results:
    student_idexpressionlevel_idtopic_idlanguage_id
    +// +// +// +// +// +// +// +// "; //Input values into table while($row = mysqli_fetch_array($result)) { echo ""; From bfe2fee334a40d438c29ed9cfb04f448ec1aeab9 Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 18:17:36 -0800 Subject: [PATCH 018/256] Update Testfindphrase.php --- corpus/Testfindphrase.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/corpus/Testfindphrase.php b/corpus/Testfindphrase.php index 9f7a04d..c771281 100644 --- a/corpus/Testfindphrase.php +++ b/corpus/Testfindphrase.php @@ -50,17 +50,14 @@ // // "; //Input values into table +//echo '
      '; + while($row = mysqli_fetch_array($result)) { - echo "
    "; - echo ""; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; } + //output the table with values in it -echo "
    Search Results:
    student_idexpressionlevel_idtopic_idlanguage_id
    language_id
    " . $row['expression_id'] . "" . $row['expression'] . "" . $row['level_id'] . "" . $row['topic_id'] . "" . $row['language_id'] . "
    "; +//echo ""; mysqli_close($con); ?> From 922e69cbc7e29317d975273f727c3437f716bdd5 Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 18:20:43 -0800 Subject: [PATCH 019/256] Update Testfindphrase.php --- corpus/Testfindphrase.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/corpus/Testfindphrase.php b/corpus/Testfindphrase.php index c771281..6ded28a 100644 --- a/corpus/Testfindphrase.php +++ b/corpus/Testfindphrase.php @@ -52,9 +52,9 @@ //Input values into table //echo '
      '; -while($row = mysqli_fetch_array($result)) { - echo "" . $row['expression'] . ""; -} +//while($row = mysqli_fetch_array($result)) { + // echo "" . $row['expression'] . ""; +//} //output the table with values in it //echo ""; From 9e02c4fa291d188495e94c1c5c4984d10b9f7217 Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 18:34:08 -0800 Subject: [PATCH 020/256] Update Testfindphrase.php --- corpus/Testfindphrase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corpus/Testfindphrase.php b/corpus/Testfindphrase.php index 6ded28a..61372e8 100644 --- a/corpus/Testfindphrase.php +++ b/corpus/Testfindphrase.php @@ -24,7 +24,7 @@ Date: Thu, 3 Mar 2016 18:38:59 -0800 Subject: [PATCH 021/256] Update Testfindphrase.php --- corpus/Testfindphrase.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/corpus/Testfindphrase.php b/corpus/Testfindphrase.php index 61372e8..f9ae252 100644 --- a/corpus/Testfindphrase.php +++ b/corpus/Testfindphrase.php @@ -24,7 +24,7 @@ Date: Thu, 3 Mar 2016 18:50:16 -0800 Subject: [PATCH 022/256] Update Testfindphrase.php --- corpus/Testfindphrase.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/corpus/Testfindphrase.php b/corpus/Testfindphrase.php index f9ae252..62e3b3b 100644 --- a/corpus/Testfindphrase.php +++ b/corpus/Testfindphrase.php @@ -31,11 +31,9 @@ die('Could not connect: ' . mysqli_error($con)); } -echo $q; //Search results for echo ($q); mysqli_select_db($con,"mysqldbproject"); -echo $q; $sql= "SELECT * FROM expressions_full WHERE expression LIKE '%{$q}%'"; //echo ($sql); //Tests the sql statement @@ -51,12 +49,14 @@ // language_id // "; //Input values into table -//echo '
        '; -//while($row = mysqli_fetch_array($result)) { - // echo "" . $row['expression'] . ""; -//} +echo '
          '; +while($row = mysqli_fetch_array($result)) { + echo '
        • '. htmlentities($row['expression'])"
          • "; +} + +echo ''; //output the table with values in it //echo ""; From 63368813414ee90ddcb763ba03f7e0b3b0e37324 Mon Sep 17 00:00:00 2001 From: brianramaswami Date: Thu, 3 Mar 2016 18:53:50 -0800 Subject: [PATCH 023/256] Update Testfindphrase.php --- corpus/Testfindphrase.php | 1 + 1 file changed, 1 insertion(+) diff --git a/corpus/Testfindphrase.php b/corpus/Testfindphrase.php index 62e3b3b..e9f7134 100644 --- a/corpus/Testfindphrase.php +++ b/corpus/Testfindphrase.php @@ -61,6 +61,7 @@ //echo ""; mysqli_close($con); +exit; ?> From 0ebdd823dcd3e59f760245f56dcbd1033ac5e69b Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Thu, 3 Mar 2016 22:13:39 -0800 Subject: [PATCH 024/256] Finished UI changes and templating for Admin branch; Mostly done with UI changes and templating for teacher and student users; finished sidebar modifications. Begun work on Corpus UI Rehaul --- FlatUI/css/theme.css | 2 +- admin/Home/index.php | 19 +- admin/ManageCourses/CreateCourse/index.php | 241 ------------------ admin/ManageCourses/index.php | 21 +- admin/ManageStudents/CreateStudent/index.php | 101 -------- .../ViewStudentProfile/index.php | 126 +++++++-- admin/ManageStudents/index.php | 112 ++++++-- admin/ManageTeachers/CreateTeacher/index.php | 101 -------- .../ViewTeacherProfile/index.php | 116 +++++++-- admin/ManageTeachers/index.php | 114 +++++++-- corpus/Results/index.php | 22 +- corpus/index.php | 12 +- corpus/search/index.php | 199 ++++++++------- corpus/sidebar.php | 68 ----- sidebar.php | 75 +++++- .../index.php | 13 +- student/MyCourses/ViewCourse/index.php | 125 +++++++-- student/MyCourses/index.php | 57 +++-- student/MyTeachers/ViewTeacher/index.php | 141 ++++++++++ .../MyTeachers/ViewTeacherProfile/index.php | 106 -------- student/MyTeachers/index.php | 56 ++-- student/home/index.php | 10 +- 22 files changed, 924 insertions(+), 913 deletions(-) delete mode 100644 admin/ManageCourses/CreateCourse/index.php delete mode 100644 admin/ManageStudents/CreateStudent/index.php delete mode 100644 admin/ManageTeachers/CreateTeacher/index.php delete mode 100644 corpus/sidebar.php rename student/MyCourses/ViewCourse/{EditWorksheet => WorksheetEditor}/index.php (90%) create mode 100644 student/MyTeachers/ViewTeacher/index.php delete mode 100644 student/MyTeachers/ViewTeacherProfile/index.php diff --git a/FlatUI/css/theme.css b/FlatUI/css/theme.css index 82963dd..91cb00e 100644 --- a/FlatUI/css/theme.css +++ b/FlatUI/css/theme.css @@ -1348,7 +1348,7 @@ th { } .table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th { - background-color: rgba(26, 188, 156, 0.15); + background-color: rgba(56, 110, 128, 1); } table col[class*="col-"] { float: none; diff --git a/admin/Home/index.php b/admin/Home/index.php index beff355..c21fe4d 100644 --- a/admin/Home/index.php +++ b/admin/Home/index.php @@ -25,16 +25,7 @@ }); - - +
          -

          Administrator Home

          +

          Administrator Home

          @@ -160,7 +151,7 @@
          -
          +
          -
          +
          -
          +
          - - - - - - -
          - -
          - -
          - -
          - -
          - -
          - -
          - - - - - - -
          -
          -
          -
          - -
          - - - - - - - - -

          Oops! You are not logged in. Redirecting to log-in in 5 seconds

          -

          Click here if you don't want to wait

          - - - - diff --git a/admin/ManageCourses/index.php b/admin/ManageCourses/index.php index a1492f9..2f26034 100644 --- a/admin/ManageCourses/index.php +++ b/admin/ManageCourses/index.php @@ -64,14 +64,8 @@
          -
          - -
          -
          + +
          -
          +
          -
          +
          +
          + +
          diff --git a/admin/ManageStudents/CreateStudent/index.php b/admin/ManageStudents/CreateStudent/index.php deleted file mode 100644 index 2568b4b..0000000 --- a/admin/ManageStudents/CreateStudent/index.php +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - -

          You do not have permission to view this page. Redirecting in 5 seconds

          -

          Click here if you don't want to wait

          - - - - -
          - -
          -
          -
          -
          - -

          -

          Register a new student account. Input form: First name, last name, username, default password, school email

          -
          -
          -
          -
          - -
          - - - - - - - - -

          Oops! You are not logged in. Redirecting to log-in in 5 seconds

          -

          Click here if you don't want to wait

          - - - - diff --git a/admin/ManageStudents/ViewStudentProfile/index.php b/admin/ManageStudents/ViewStudentProfile/index.php index 6f8266f..55593e2 100644 --- a/admin/ManageStudents/ViewStudentProfile/index.php +++ b/admin/ManageStudents/ViewStudentProfile/index.php @@ -13,6 +13,9 @@ + + + @@ -25,16 +28,7 @@ }); - - + -
          -
          -
          -
          - -

          View Student Account

          -

          Documentation:

          -

          After accepting a form submission from ManageStudents, this page will display the profile of a given student user

          +
          +
          +
          +

          Stu D. Ent

          +
          +
          +
          +
          +
          +
          +

          Student Info

          +
          +
          +

          Active Courses:

          +

          Total Courses:

          +
          +
          +
          +
          +
          +
          +

          Recent Courses

          +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + +
          Course NumberSessionStatusPercent Complete
          ELCT 102Fall II 2012Complete
          +
          +
          ELCT 103Spring I 2013Partial
          +
          +
          +
          +
          +
          +
          +
          +
          +

          Student Progress

          +
          +
          +
          +
          +
          +
          +

          Statistics

          +
          +
          +
          +
          +
          +
          +
          +
          +

          Completed Worksheets

          +
          +
          + + + + + + + + + + + + + + + + + + + +
          Course NumberCourse NameSessionWorksheet NumberPerformance
          ELCT 101Basic Oral CommunicationFall II 20145
          +
          +
          +
          +
          diff --git a/admin/ManageStudents/index.php b/admin/ManageStudents/index.php index cd71b1e..8ac2b1d 100644 --- a/admin/ManageStudents/index.php +++ b/admin/ManageStudents/index.php @@ -12,6 +12,7 @@ + @@ -25,16 +26,6 @@ }); - - -
          -
          -
          -
          - -

          Manage Student Accounts

          -

          Documentation:

          -

          Page will provide search functionality and student profile view, for reviewing of accounts. Provides a field for creating a student account. Potentially will involve an option for inputing account info en masse, i.e. via a file

          +
          +
          +

          Gonzaga University Students

          + +
          +
          +
          + +
          +
          Add New Student (Manually)
          +
          +
          +
          + + +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          + + +
          + + +
          + +
          +
          +
          + + +
          +
          + + +
          +
          Add New Student (By File)
          +
          +
          +
          + +

          File format: .csv

          +

          Columns (no headers): First Name, Last Name, Email, Alternate Email, Nickname, Designation

          +
          + +
          +
          +
          + + +
          +
          +
          +
          + +
          +
          Students
          +
          + + + + + + + + + + + + + + + + + + +
          InstitutionNameDate AddedAdded ByVisit Page
          Gonzaga UniversityStu Dent3/3/2016T. CherView Student +
          +
          + +
          +
          diff --git a/admin/ManageTeachers/CreateTeacher/index.php b/admin/ManageTeachers/CreateTeacher/index.php deleted file mode 100644 index c7e0b5e..0000000 --- a/admin/ManageTeachers/CreateTeacher/index.php +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - Gonzaga Small Talk - - - - - - - - - - - - - - - - -

          You do not have permission to view this page. Redirecting in 5 seconds

          -

          Click here if you don't want to wait

          - - - - -
          - -
          -
          -
          -
          - -

          -

          Register a new teacher account. Input form: First name, last name, username, default password, school email

          -
          -
          -
          -
          - -
          - - - - - - - - -

          Oops! You are not logged in. Redirecting to log-in in 5 seconds

          -

          Click here if you don't want to wait

          - - - - diff --git a/admin/ManageTeachers/ViewTeacherProfile/index.php b/admin/ManageTeachers/ViewTeacherProfile/index.php index e30ef9e..c1288f9 100644 --- a/admin/ManageTeachers/ViewTeacherProfile/index.php +++ b/admin/ManageTeachers/ViewTeacherProfile/index.php @@ -12,6 +12,7 @@ + @@ -25,16 +26,6 @@ }); - - -
          -
          -
          -
          - -

          View Teacher Profile/Account

          -

          Documentation:

          -

          After accepting a form submission from ManageTeachers, this page will display the profile of a given teacher user

          + +
          + +
          +
          +

          Firstname Lastname

          +
          +
          +
          +
          +
          +
          +

          Teacher Information

          +
          +
          +

          Institution:

          +

          Joined SmallTalk:

          +

          Last Active Session:

          +

          Number of SmallTalk
          Courses:

          +
          +
          +
          +
          +
          +
          +

          Courses

          +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + + +
          Course NumberCourse NameSessionStatusGo To
          ELCT 107Communications SeminarFall I 2015ArchivedView Course
          ELCT 107Communications SeminarSpring II 2016ActiveView Course
          +
          +
          +
          +
          +
          +
          +
          +
          +

          Teacher Activity

          +
          +
          + + + + + + + + + + + + + + + + + + + + + + + + + + +
          DateCourse NameActive SessionAction NameGo To
          1/1/2016Basic Oral CommunicationSpring I 2016Distributed WorksheetView Worksheet
          1/8/2016Basic Oral CommunicationSpring I 2016Submitted Worksheet to CorpusView Submission
          +
          +
          diff --git a/admin/ManageTeachers/index.php b/admin/ManageTeachers/index.php index 6cfe5f3..724092a 100644 --- a/admin/ManageTeachers/index.php +++ b/admin/ManageTeachers/index.php @@ -12,6 +12,7 @@ + @@ -25,16 +26,6 @@ }); - - -
          -
          -
          -
          - -

          Manage Teacher Accounts

          -

          Documentation:

          -

          Page will provide search functionality and teacher profile view, for reviewing of accounts. Provides a field for creating a teacher account. Potentially will involve an option for inputing account info en masse, i.e. via a file

          +
          +
          +
          +

          Gonzaga University Teachers

          +
          + + +
          +
          +
          + +
          +
          Add New Teacher (Manually)
          +
          +
          +
          + + +
          +
          +
          +
          +
          +
          +
          +
          +
          + + +
          + + +
          + +
          +
          +
          + + +
          +
          + + +
          +
          Add New Teacher (By File)
          +
          +
          +
          + +

          File format: .csv

          +

          Columns (no headers): First Name, Last Name, Email, Alternate Email, Designation

          +
          + +
          +
          +
          + + +
          +
          +
          +
          + +
          +
          Teachers
          +
          + + + + + + + + + + + + + + + + + + +
          InstitutionNameDate AddedAdded ByVisit Page
          Gonzaga UniversityT. Cher3/3/2016Ah D. MinView Teacher +
          +
          + +
          +
          diff --git a/corpus/Results/index.php b/corpus/Results/index.php index 62360c7..3ae5474 100644 --- a/corpus/Results/index.php +++ b/corpus/Results/index.php @@ -13,6 +13,8 @@ + + @@ -26,16 +28,6 @@ }); - - -
          -
          -
          -
          - +
          +
          +
          +
          Search for a course
          diff --git a/corpus/index.php b/corpus/index.php index 2153d84..53e4d1d 100644 --- a/corpus/index.php +++ b/corpus/index.php @@ -12,6 +12,7 @@ + @@ -25,16 +26,6 @@ }); - - -
          diff --git a/corpus/search/index.php b/corpus/search/index.php index 8d5fd36..6b305db 100644 --- a/corpus/search/index.php +++ b/corpus/search/index.php @@ -10,8 +10,10 @@ - + + + @@ -19,15 +21,10 @@ - - - - - + - - + @@ -81,16 +78,8 @@ min-width: 569px; } - - + + -
          -
          -
          -
          - -
          -
          - -
          - - - - - -
          - +
          -
          - -

          Suggestions:

          + + +
          +
          +
          +
          +
          +
          + +
          +
          + +
          +
          -
          - -
          - +
          +
          -
          -
          - -
          - -
          - +
          + +
          +
          +
          +
          +

          Search Results

          +
          +
          + + + + + + + + + + - - +
          ExpressionVocab/ContextTopicLanguageLevel
          - - - - - - +
          +
          -
          -
          -
          +
          diff --git a/corpus/sidebar.php b/corpus/sidebar.php deleted file mode 100644 index b4ed0db..0000000 --- a/corpus/sidebar.php +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - -
          - -
          - - - - - -

          Your account does not have authorization to view this page.

          -

          Rerouting to your home page. Click here if you don't want to wait.

          - - - - \ No newline at end of file diff --git a/sidebar.php b/sidebar.php index 1fb1c6f..02e532c 100644 --- a/sidebar.php +++ b/sidebar.php @@ -31,8 +31,10 @@ // Make the first (and in this case, only) row of the result set available for reading. $RolesList = []; + $NumRoles = 0; while( sqlsrv_fetch( $stmt ) === true) { $RolesList[] = sqlsrv_get_field( $stmt, 0); + $NumRoles += 1; } if($_SESSION['Role'] == 'Admin') { @@ -51,7 +53,9 @@
          • @@ -72,20 +101,56 @@

          Students

          + 'static' ); + $coursestudentsSQL = "SELECT S.FirstName, S.LastName, S.StudentID + FROM Students as S, Enrollment as ER, Courses as C + WHERE C.CourseID = ? AND + ER.CourseID = C.CourseID AND + S.StudentID = ER.StudentID"; + $coursestudents = sqlsrv_query($con, $coursestudentsSQL, $params, $options); + if ($coursestudents === false) + die(print_r(sqlsrv_errors(), true)); + $num_students = sqlsrv_num_rows($coursestudents); + $firstnames = []; + $lastnames = []; + $ids = []; + while (sqlsrv_fetch($coursestudents) === true) + { + $firstnames[] = sqlsrv_get_field($coursestudents, 0); + $lastnames[] = sqlsrv_get_field($coursestudents, 1); + $ids[] = sqlsrv_get_field($coursestudents, 2); + } + ?> + - + - - - - - + "; + echo ""; + echo ""; + echo ""; + }?>
          Name Go ToGo To (Archive)Go To Archive
          Stu DentStudent PageView in Archive
          $firstnames[$i] $lastnames[$i] +
          + + +
          +           		+
          + + +
          +
          @@ -98,7 +163,7 @@ SQLSRV_CURSOR_KEYSET); ?>
          diff --git a/teacher/MyCourses/index.php b/teacher/MyCourses/index.php index 2a5a967..027292d 100644 --- a/teacher/MyCourses/index.php +++ b/teacher/MyCourses/index.php @@ -45,9 +45,10 @@ } else { - $institutionID = isset($_GET['in']) ? $_GET['in'] : 0; // Default Institution = 1 - $username = $_SESSION['Username']; + $institutionID = isset($_POST['institutionid']) ? $_POST['institutionid'] : 0; + + /*$username = $_SESSION['Username']; $params = array($username); $teacherIDQuery = "SELECT TeacherID FROM Teachers WHERE [SiteUsername] = ?"; @@ -61,42 +62,64 @@ if ( sqlsrv_fetch( $stmt ) === true) $teacherID = sqlsrv_get_field( $stmt, 0); else - echo "SQL ERROR"; + echo "SQL ERROR";*/ + + if ($institutionID == 0) + { + $params = array($_SESSION['Username']); + $options = array( "Scrollable" => 'static' ); + $CoursesQuery = " + SELECT C.CourseID, CT.CourseName, C.Section, ST.SessionName, SI.Year + FROM Courses as C, [CourseTypes] as CT, [SessionType] as ST, SessionInstance as SI, TeachingInstance as TI + WHERE TI.SiteUsername = ? AND + C.TeachingInstanceID = TI.TeachingInstanceID AND + C.Status = 'Active' AND + CT.CourseTypesID = C.CourseTypesID AND + SI.SessionInstanceID = C.SessionInstanceID AND + ST.SessionTypeID = SI.SessionTypeID"; + } + else + { + $params = array($_SESSION['Username'], $institutionID); + $options = array( "Scrollable" => 'static' ); + $CoursesQuery = " + SELECT C.CourseID, CT.CourseName, C.Section, ST.SessionName, SI.Year + FROM Courses as C, [CourseTypes] as CT, [SessionType] as ST, SessionInstance as SI, TeachingInstance TI + WHERE TI.SiteUsername= ? AND + C.TeachingInstanceID = TI.TeachingInstanceID AND + C.Status = 'Active' AND + C.InstitutionID = ? AND + CT.CourseTypesID = C.CourseTypesID AND + SI.SessionInstanceID = C.SessionInstanceID AND + ST.SessionTypeID = SI.SessionTypeID"; + } - $params = array($institutionID, $teacherID); - $options = array( "Scrollable" => 'static' ); - $CoursesQuery = " - SELECT TC.CourseID, CT.CourseName, TC.Section, S.SessionName - FROM Courses as TC, [CourseTypes] as CT, [SessionType] as S, SessionInstance as SI - WHERE TC.InstitutionID = ? AND - TC.TeachingInstance = ? AND - CT.CourseTypeID = TC.CourseTypesID AND - SI.SessionInstanceID = TC.SessionInstanceID AND - SI.SessionTypeID = S.ID - GROUP BY TC.CoursesID, CT.CourseName, TC.Section, S.SessionName"; $stmt = sqlsrv_query($con, $CoursesQuery, $params, $options); - $length = 0; + if ( $stmt === false) + die( print_r( sqlsrv_errors(), true)); + $length = sqlsrv_num_rows($stmt); $courseID = []; $ClassNames = []; $Sections = []; $SessionNames = []; - if ( $stmt === false) - die( print_r( sqlsrv_errors(), true)); + $SessionYears = []; + while (sqlsrv_fetch( $stmt ) === true) { $courseID[] = sqlsrv_get_field( $stmt, 0); $ClassNames[] = sqlsrv_get_field( $stmt, 1); $Sections[] = sqlsrv_get_field( $stmt, 2); $SessionNames[] = sqlsrv_get_field( $stmt, 3); - $length++; + $SessionYears[] = sqlsrv_get_field( $stmt, 4); } - $params = array($teacherID); - $institutionsQuery = "SELECT DISTINCT I.InstitutionName, I.InstitutionID FROM Institutions as I, TeachingInstance as TI WHERE TI.TeacherID = ? AND I.InstitutionID = TI.InstitutionID"; + $params = array($_SESSION['Username']); + $institutionsQuery = "SELECT DISTINCT I.InstitutionName, I.InstitutionID FROM Institutions as I, TeachingInstance as TI WHERE TI.SiteUsername = ? AND I.InstitutionID = TI.InstitutionID"; $stmt = sqlsrv_query( $con, $institutionsQuery, $params, $options); if ($stmt === false) die (print_r(sqlsrv(errors(), true))); + $num_institutions = sqlsrv_num_rows($stmt); $institutions = []; $institutionsIDs = []; while (sqlsrv_fetch($stmt) === true) @@ -124,8 +147,12 @@

          My Courses

          + 1) + { + ?>
          -
          +
          Filter Courses @@ -133,35 +160,30 @@
          -
          - + + 0) && ($institutionIDs[$i] == $institutionID)) - { - ?> - - - +
          +
          + +
          @@ -177,21 +199,18 @@ - - Fall II 2014 - Entry - 1 - Course Page - + "; - echo "$SessionNames[$i]"; + echo "$SessionNames[$i] $SessionYears[$i]"; echo "$ClassNames[$i]"; echo "$Sections[$i]"; - echo "Course Page"; - echo ""; + echo " +
          "; + + echo ""; }?> diff --git a/teacher/MyStudents/ViewStudentProfile/index.php b/teacher/MyStudents/ViewStudent/index.php similarity index 100% rename from teacher/MyStudents/ViewStudentProfile/index.php rename to teacher/MyStudents/ViewStudent/index.php From 89acc23d1edd31553a6c5279b79ee0497e472dc2 Mon Sep 17 00:00:00 2001 From: Menezes Date: Mon, 4 Apr 2016 20:07:40 -0700 Subject: [PATCH 186/256] worksheet works no php yet --- js/dynamicRow.js | 6 +++- .../ViewCourse/WorksheetEditor/index.php | 35 +++++++++++-------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/js/dynamicRow.js b/js/dynamicRow.js index 50d5136..ab47032 100644 --- a/js/dynamicRow.js +++ b/js/dynamicRow.js @@ -1,16 +1,20 @@ $(function(){ // Find a element with id="myTable": var exprTable = document.getElementById("myTable"); - var corrExpr = document.getElementById("CorrectedExpr"); + var corrExpr; $('#EditExpression').on('click',function(e) { var expr = exprTable.getElementsByTagName("td"); document.getElementById("ExprToEdit").innerHTML= expr[1].innerHTML; document.getElementById("EditID").innerHTML= expr[0].innerHTML; + document.getElementById("Expression").innerHTML=expr[1].innerHTML; + $("#CorrectedExpr").val(expr[1].innerHTML); }); $('#SubmitExpr').on('click',function(e){ + corrExpr = document.getElementById("CorrectedExpr").value; document.getElementById("ExpressionStatus").innerHTML='Complete'; document.getElementById("Expression").innerHTML=corrExpr; + $("#CorrectedExpr").val(""); }) }); diff --git a/student/MyCourses/ViewCourse/WorksheetEditor/index.php b/student/MyCourses/ViewCourse/WorksheetEditor/index.php index cb67b76..f7795a7 100644 --- a/student/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/student/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -171,25 +171,32 @@
          Expression Edit Window
          -
          - # -
          -
          - Expression -
          + +
          + # +
          +
          + Expression +
          - -
          -
          -
          + + +
          +
          + +
          + + + -
          +
          - +
          From 03dd065cb3c8a9dbc543314bb9329bfc9107215f Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Mon, 4 Apr 2016 20:08:41 -0700 Subject: [PATCH 187/256] Edits to teacher view course --- teacher/MyCourses/ViewCourse/index.php | 81 ++++++++++++++------------ 1 file changed, 45 insertions(+), 36 deletions(-) diff --git a/teacher/MyCourses/ViewCourse/index.php b/teacher/MyCourses/ViewCourse/index.php index 831c5b7..a84a5d5 100644 --- a/teacher/MyCourses/ViewCourse/index.php +++ b/teacher/MyCourses/ViewCourse/index.php @@ -160,12 +160,32 @@
          - SQLSRV_CURSOR_KEYSET); - ?> + SQLSRV_CURSOR_KEYSET); + $worksheets = sqlsrv_query($con, $WorksheetsSQL, $params, $options); + if ($worksheets === false) + die(print_r(sqlsrv_errors(), true)); + $num_worksheets = sqlsrv_num_rows($worksheets); + $new_worksheet_number = $num_worksheets + 1; + + $worksheetIDs = []; + $worksheet_numbers = []; + $statuses = []; + $dates = []; + while(sqlsrv_fetch($worksheets) === true) + { + $worksheetIDs[] = sqlsrv_get_field($worksheets, 0); + $worksheet_numbers[] = sqlsrv_get_field($worksheets, 1); + $statuses[] = sqlsrv_get_field($worksheets, 2); + $dates[] = sqlsrv_get_field($worksheets, 3); + } + + ?>
          Worksheets
          @@ -173,7 +193,7 @@
          - +
          @@ -189,35 +209,24 @@
          - - - - - - - - - - - - - - - - - - - - - + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?>
          33/4/2016In ProgressEdit Worksheet - - - -
          22/27/2016In ProgressEdit Worksheet -
          - -
          -
          13/4/2016PublishedView WorksheetNo Action
          $worksheet_numbers[$i]$dates[$i]$statuses[$i]Do Something +
          + + +
          +
          From 219dcab5f2c7d415ac6cb8afff1489ed65662c60 Mon Sep 17 00:00:00 2001 From: Menezes Date: Tue, 5 Apr 2016 12:07:35 -0700 Subject: [PATCH 188/256] expr num formatted and starting work on dynamic table for expression list, needs php now though ASAP --- js/dynamicRow.js | 25 ++++++++++++--- .../ViewCourse/WorksheetEditor/index.php | 32 +++++++------------ 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/js/dynamicRow.js b/js/dynamicRow.js index ab47032..0ff4fca 100644 --- a/js/dynamicRow.js +++ b/js/dynamicRow.js @@ -2,12 +2,15 @@ $(function(){ // Find a element with id="myTable": var exprTable = document.getElementById("myTable"); var corrExpr; + var exprHead; $('#EditExpression').on('click',function(e) { + var exprRow = exprTable.getElementsByTagName("tr"); var expr = exprTable.getElementsByTagName("td"); - document.getElementById("ExprToEdit").innerHTML= expr[1].innerHTML; - document.getElementById("EditID").innerHTML= expr[0].innerHTML; - document.getElementById("Expression").innerHTML=expr[1].innerHTML; + + document.getElementById("ExprToEdit").innerHTML = expr[1].innerHTML; + document.getElementById("ExprID").innerHTML = "- #" + expr[0].innerHTML; + document.getElementById("Expression").innerHTML = expr[1].innerHTML; $("#CorrectedExpr").val(expr[1].innerHTML); }); @@ -16,5 +19,19 @@ $(function(){ document.getElementById("ExpressionStatus").innerHTML='Complete'; document.getElementById("Expression").innerHTML=corrExpr; $("#CorrectedExpr").val(""); - }) + }); + + $("tr").each(function(index) { + if (index !=0) { + $row = $(this); + + var id = $row.find("td:first").text(); + + if (id.indexOf(value) != 0) { + $(this).hide(); + } else { + $(this).show(); + } + } + }); }); diff --git a/student/MyCourses/ViewCourse/WorksheetEditor/index.php b/student/MyCourses/ViewCourse/WorksheetEditor/index.php index f7795a7..18a4bf5 100644 --- a/student/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/student/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -168,29 +168,21 @@
          -
          Expression Edit Window
          +
          Expression Edit Window + +
          + +
          - -
          - # -
          -
          - Expression -
          - - +
          + Expression +
          -
          -
          - -
          - - - +
          + +
          From 8f479002b426759c0d28e61d89d449917c338cf6 Mon Sep 17 00:00:00 2001 From: Menezes Date: Tue, 5 Apr 2016 22:48:27 -0700 Subject: [PATCH 189/256] fixing sidebar fail --- js/dynamicRow.js | 4 +- .../ViewCourse/WorksheetEditor/index.php | 50 +++++++++++++------ 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/js/dynamicRow.js b/js/dynamicRow.js index 0ff4fca..d16b438 100644 --- a/js/dynamicRow.js +++ b/js/dynamicRow.js @@ -21,7 +21,7 @@ $(function(){ $("#CorrectedExpr").val(""); }); - $("tr").each(function(index) { + /*$("tr").each(function(index) { if (index !=0) { $row = $(this); @@ -33,5 +33,5 @@ $(function(){ $(this).show(); } } - }); + });*/ }); diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php index 9a29c94..9d95b30 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -19,6 +19,7 @@ + @@ -140,6 +140,7 @@
          + @@ -150,6 +151,7 @@ + + + - - - - + + + + + + + +
          Student # Expression Vocab
          Pablo Sanchez 1 This is a sample expression for the purpose of demonstrating how text will wrap when we type too many words. @@ -173,11 +175,11 @@
          Expressions
          - +
          + +
          - + +
          -
          +
          + +
          From be86ac06fd246fccb3695cb05b39efd6e5ae397a Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Wed, 6 Apr 2016 10:19:26 -0700 Subject: [PATCH 192/256] Changes to Teacher archive/students, /home, and mycourses/ --- base.php | 1 + .../Archive/Students/ViewStudent/index.php | 130 ++++++++++------ teacher/Archive/Students/index.php | 68 +++++--- teacher/Home/index.php | 18 +-- .../MyCourses/ViewCourse/PublishWorksheet.php | 12 ++ teacher/MyCourses/ViewCourse/index.php | 145 ++++++++++++------ teacher/MyCourses/index.php | 8 +- 7 files changed, 256 insertions(+), 126 deletions(-) create mode 100644 teacher/MyCourses/ViewCourse/PublishWorksheet.php diff --git a/base.php b/base.php index ee9c17c..23cd492 100644 --- a/base.php +++ b/base.php @@ -1,5 +1,6 @@ 'static' ); + $studentinfoSQL = "SELECT CONVERT(VARCHAR(11), SU.date_added,106), ST.SessionName, SI.Year + FROM Students S, SiteUsers SU, SessionType ST, SessionInstance SI, Enrollment ER, Courses C + WHERE S.StudentID = ? AND + SU.username = S.SiteUsername AND + ER.StudentID = S.StudentID AND + C.CourseID = ER.CourseID AND + SI.SessionInstanceID = C.SessionInstanceID AND + ST.SessionTypeID = SI.SessionTypeID"; + $studentinfo = sqlsrv_query($con, $studentinfoSQL, $params, $options); + if ($studentinfo === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($studentinfo) === true) { + $last_session = sqlsrv_get_field($studentinfo, 0); + $date_added = sqlsrv_get_field($studentinfo, 1); + $year_added = sqlsrv_get_field($studentinfo, 2); + + } + ?>
          @@ -60,13 +83,19 @@
          + +
          +
          +

          +
          +
          Student Information
          -

          Last Active Session:

          -

          Joined SmallTalk:

          +

          Last Active Session:

          +

          Joined SmallTalk:

          @@ -74,7 +103,7 @@
          - Statistics + Statistics/Performance Review
          @@ -83,58 +112,68 @@
          -
          Courses
          -
          -
          -

          Filter Courses:

          -
          -
          - -
          -
          -
          -
          - - -
          -
          -
          +
          Student Expressions
          +
          + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + "; + ?>
          ExpressionContext/Vocab SessionLevelGo ToAnnotation EditorCourseWorksheet NumberWorksheet
          Fall I 2012BasicView WorksheetAnnotation Editor
          Fall II 2012IntermediateView WorksheetAnnotation Editor
          $expressions[$i]$contexts[$i]$sessionnames[$i] $years[$i]$coursenames[$i]$worksheetnums[$i]
          + +
          - - -
          -
          -
          @@ -152,7 +191,6 @@
          -
          Filter Results
          +
          Search for a Student
          - +
          -
          @@ -77,34 +76,61 @@
          -
          My Student Archive
          +
          Students
          -
          - - -
          - - + 'static' ); + $mystudentsSQL = "SELECT S.FirstName, S.LastName, S.StudentID, ST.SessionName, SI.Year + FROM Students as S, SessionType as ST, SessionInstance as SI, TeachingInstance as TI, Enrollment as ER, Courses as C + WHERE TI.SiteUsername = ? AND + C.TeachingInstanceID = TI.TeachingInstanceID AND + ER.CourseID = C.CourseID AND + S.StudentID = ER.StudentID AND + SI.SessionInstanceID = C.SessionInstanceID AND + ST.SessionTypeID = SI.SessionTypeID"; + $mystudents = sqlsrv_query($con, $mystudentsSQL, $params, $options); + if ($mystudents === false) + die(print_r(sqlsrv_errors(), true)); + $numstudents = sqlsrv_num_rows($mystudents); + $firstnames = []; + $lastnames = []; + $ids = []; + $sessionnames = []; + $years = []; + while (sqlsrv_fetch($mystudents) === true) + { + $firstnames[] = sqlsrv_get_field($mystudents, 0); + $lastnames[] = sqlsrv_get_field($mystudents, 1); + $ids[] = sqlsrv_get_field($mystudents, 2); + $sessionnames[] = sqlsrv_get_field($mystudents, 3); + $years[] = sqlsrv_get_field($mystudents, 4); + } + for($i = 0; $i < $numstudents; $i++) + { + $id = $ids[$i]; + echo " + + + "; + + } + ?> +
          Name Last Active SessionLast Active Course Go To
          $firstnames[$i] $lastnames[$i]$sessionnames[$i] $years[$i]
          + + + +
          diff --git a/teacher/Home/index.php b/teacher/Home/index.php index 099a2ff..33a7f3e 100644 --- a/teacher/Home/index.php +++ b/teacher/Home/index.php @@ -85,11 +85,11 @@
          -
          -
          +
          +
          -
          +

          Active Courses

          @@ -163,16 +163,16 @@
          -
          -
          +
          +
          -
          +

          My Students

          -
          +
          @@ -232,7 +232,7 @@ -
          +
          diff --git a/teacher/MyCourses/ViewCourse/PublishWorksheet.php b/teacher/MyCourses/ViewCourse/PublishWorksheet.php new file mode 100644 index 0000000..633ba7e --- /dev/null +++ b/teacher/MyCourses/ViewCourse/PublishWorksheet.php @@ -0,0 +1,12 @@ +"; +else +{ + echo "PublishWorksheet Script"; + echo ""; +} diff --git a/teacher/MyCourses/ViewCourse/index.php b/teacher/MyCourses/ViewCourse/index.php index a84a5d5..f46572c 100644 --- a/teacher/MyCourses/ViewCourse/index.php +++ b/teacher/MyCourses/ViewCourse/index.php @@ -60,7 +60,7 @@
          -

          Course Info

          +

          Course Info

          SQLSRV_CURSOR_KEYSET); + $worksheets = sqlsrv_query($con, $WorksheetsSQL, $params, $options); + if ($worksheets === false) + die(print_r(sqlsrv_errors(), true)); + $num_worksheets = sqlsrv_num_rows($worksheets); + $new_worksheet_number = $num_worksheets + 1; + $today = date("F j, Y"); + + $worksheetIDs = []; + $worksheet_numbers = []; + $statuses = []; + $dates = []; + while(sqlsrv_fetch($worksheets) === true) + { + $worksheetIDs[] = sqlsrv_get_field($worksheets, 0); + $worksheet_numbers[] = sqlsrv_get_field($worksheets, 1); + $statuses[] = sqlsrv_get_field($worksheets, 2); + $dates[] = sqlsrv_get_field($worksheets, 3); + } + echo "

          Name: $ClassName

          Institution: $InstitutionName

          Session: $SessionName $SessionYear

          @@ -94,11 +119,49 @@ ?>
          +
          +
          + New Worksheet +
          +
          +
          + +
          +
          +
          +
          +

          Worksheet #

          +
          +
          +
          +
          + +
          +
          +
          +

          My Students Will See:

          +
          + +
          +
          + +
          +
          + +
          +
          +
          + + + + +
          +
          -
          +
          -

          Students

          +

          Students

          "; echo "
          "; echo ""; echo ""; @@ -160,44 +225,11 @@
          - SQLSRV_CURSOR_KEYSET); - $worksheets = sqlsrv_query($con, $WorksheetsSQL, $params, $options); - if ($worksheets === false) - die(print_r(sqlsrv_errors(), true)); - $num_worksheets = sqlsrv_num_rows($worksheets); - $new_worksheet_number = $num_worksheets + 1; - - $worksheetIDs = []; - $worksheet_numbers = []; - $statuses = []; - $dates = []; - while(sqlsrv_fetch($worksheets) === true) - { - $worksheetIDs[] = sqlsrv_get_field($worksheets, 0); - $worksheet_numbers[] = sqlsrv_get_field($worksheets, 1); - $statuses[] = sqlsrv_get_field($worksheets, 2); - $dates[] = sqlsrv_get_field($worksheets, 3); - } - - ?> -
          + +
          Worksheets
          -
          -
          -
          - - -
          -
          -
          $firstnames[$i] $lastnames[$i] -
          - + +
          		-
          - + + + +
          @@ -205,25 +237,40 @@ - + "; echo ""; echo ""; echo ""; - echo ""; - echo ""; + } + else + { + echo ""; + } + echo ""; + + "; + echo "
          +
          + + + +
          + "; echo ""; } ?> diff --git a/teacher/MyCourses/index.php b/teacher/MyCourses/index.php index 027292d..f820c81 100644 --- a/teacher/MyCourses/index.php +++ b/teacher/MyCourses/index.php @@ -208,7 +208,13 @@ echo ""; echo ""; echo ""; From 447bdd3367a95ddc71da5f91eda333d95b3fd253 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Wed, 6 Apr 2016 17:16:11 -0700 Subject: [PATCH 193/256] Changes to teacher worksheeteditor (and additional files); changes to corpus results UI --- corpus/Results/index.php | 83 +++- corpus/search/index.php | 44 +- js/dynamicRowTeacher.js | 13 + .../WorksheetEditor/PopulateEditor.php | 134 ++++++ .../ViewCourse/WorksheetEditor/index.php | 422 +++++++----------- 5 files changed, 398 insertions(+), 298 deletions(-) create mode 100644 teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php diff --git a/corpus/Results/index.php b/corpus/Results/index.php index be54fb8..fd815d3 100644 --- a/corpus/Results/index.php +++ b/corpus/Results/index.php @@ -13,16 +13,14 @@ - +

          Build Search Query

          -
          -
          -
          - -
          - - +
          +
          +
          +
          + +
          + + +
          + +
          Date Status Go ToActionPerform an Action
          $worksheet_numbers[$i]$dates[$i]$statuses[$i]Do Something -
          + if ($statuses[$i] == "Released") + { + echo "
          +
          + -
          -
          $ClassNames[$i]$Sections[$i] -
          "; +
          + + + + + +
          "; echo "
          + + + + + + + + + + +
          TypeContentAction
          - - - - - - - - - - - - -
          TypeContentAction
          -
          +
          diff --git a/js/dynamicRowTeacher.js b/js/dynamicRowTeacher.js index 383544d..edebc32 100644 --- a/js/dynamicRowTeacher.js +++ b/js/dynamicRowTeacher.js @@ -29,6 +29,19 @@ $(function(){ $("#PronCorr").val(""); }); + $("button[name=SelectExpression]").on('click', function(e){ + var expressionid = $(this).val(); + $.ajax({ + type: "POST", + url: "PopulateEditor.php", + data: 'expressionid='+expressionid, + + success: function(data){ + $("div[name='ExpressionEditor']").empty(); + $("div[name='ExpressionEditor']").html(data); + } + }); + }); /*$("tr").each(function(index) { if (index !=0) { $row = $(this); diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php new file mode 100644 index 0000000..b77183f --- /dev/null +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php @@ -0,0 +1,134 @@ + 'static'); + $coursestudentsSQL = "SELECT S.StudentID, S.FirstName, S.LastName + FROM Expressions as E, Enrollment as ER, Worksheets as W, Courses C, Students S + WHERE E.ExpressionID = ? AND + W.WorksheetID = E.WorksheetID AND + C.CourseID = W.CourseID AND + ER.CourseID = C.CourseID AND + S.StudentID = ER.StudentID"; + $coursestudents = sqlsrv_query($con, $coursestudentsSQL, $params, $options); + if ($coursestudents === false) + die(print_r(sqlsrv_errors(), true)); + $num_students = sqlsrv_num_rows($coursestudents); + $studentsids = []; + $first_names = []; + $last_names = []; + while(sqlsrv_fetch($coursestudents) === true) + { + $studentids[] = sqlsrv_get_field($coursestudents, 0); + $first_names[] = sqlsrv_get_field($coursestudents, 1); + $last_names[] = sqlsrv_get_field($coursestudents, 2); + } + + $expressiondataSQL = "SELECT E.Expression, E.[Context/Vocabulary], E.Pronunciation, S.StudentID, S.FirstName, S.LastName, E.AllDo + FROM Expressions E, Students S + WHERE E.ExpressionID = ? AND + S.StudentID = E.Student_ID"; + $expressiondata = sqlsrv_query($con, $expressiondataSQL, $params, $options); + if ($expressiondata === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($expressiondata) === true) + { + $expression = sqlsrv_get_field($expressiondata, 0); + $context = sqlsrv_get_field($expressiondata, 1); + $pronunciation = sqlsrv_get_field($expressiondata, 2); + $selected_student_id = sqlsrv_get_field($expressiondata, 3); + $selected_first_name = sqlsrv_get_field($expressiondata, 4); + $selected_last_name = sqlsrv_get_field($expressiondata, 5); + $alldo = sqlsrv_get_field($expressiondata, 6); + } +} + + +echo " +
          +
          + +
          +
          + +
          +
          "; +if ($alldo == 1) +{ + echo "
          + +
          +
          + +
          "; +} +else +{ + echo "
          + +
          +
          + +
          "; +} +echo " + +
          +
          +
          +
          + + +
          +
          +
          +
          + + +
          +
          + + +
          +
          +
          +
          + +
          +
          +
          +
          +
          + +
          +
          + +
          + +
          +
          + +
          +
          +"; +?> \ No newline at end of file diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php index fe4a798..fce6d03 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -21,26 +21,13 @@ - - --> -
          -
          - -
          - -
          -
          - 
          -                                                    
          Expressions:
          
-                                                    
          1. I no understand how to talk English
          
-                                                    
          2. How is you today?
          
-                                                    
          3. I drive to home for meal
          
-                                                    
          4. I no understand how to talk English
          
-                                                    
          5. How is you today?
          
-                                                    
          6. I drive to home for meal
          
-                                                    
          7. I no understand how to talk English
          
-                                                    
          8. How is you today?
          
-                                                    
          9. I drive to home for meal
          
-                                                    
          10. I drive to home for meal
          
-
          +
          +

          I no understand English

          +

          Expression:

          +
          I no understand how to talk English
          +
          -
          -
          - +
          + +
          +
          +
          +
          @@ -190,6 +180,7 @@ + -
          @@ -228,12 +218,11 @@ Separated link -
          -
          + -
          + -
          + -
          +
          +
          +
          @@ -334,6 +326,7 @@ e.preventDefault(); $("#wrapper").toggleClass("toggled"); }); +
          + Annotation Editor 'static'); diff --git a/admin/Archive/Courses/ViewCourse/index.php b/admin/Archive/Courses/ViewCourse/index.php index f13dfd0..d23977c 100644 --- a/admin/Archive/Courses/ViewCourse/index.php +++ b/admin/Archive/Courses/ViewCourse/index.php @@ -65,6 +65,7 @@
          Course Info
          + View Worksheet 'static'); diff --git a/admin/Archive/Courses/index.php b/admin/Archive/Courses/index.php index 84c3c5a..2448d16 100644 --- a/admin/Archive/Courses/index.php +++ b/admin/Archive/Courses/index.php @@ -66,6 +66,7 @@
          + View Course
          -
          -
          +
          +
          +
          +

          Worksheet Details

          +
          +
          +

          Course

          +

          Date

          +

          Topic

          +
          +
          +
          +
          +
          - Expressions List +

          Expressions List

          @@ -81,7 +93,7 @@ - + @@ -89,7 +101,7 @@ - +
          # Student ExpressionGo ToContext/Vocab
          1 Name Here's a expressionOpen in EditorSome Context
          @@ -98,217 +110,121 @@
          -
          -
          +
          +
          - Editor +

          Editor

          -
          +
          - -
          -

          I no understand English

          -

          Expression:

          -
          I no understand how to talk English
          - -
          + + + + + + + + + + + + + + + + + + + + + +
          #Expression
          1 +
          + Here's a expression +
          +
          2 +
          + Another Expressions +
          +
          3 +
          + Yet another expressive +
          +
          - -
          - -
          - -
          - -
          -
          - - -
          - -
          - - -
          - -
          - - - - - - - - - - - + +
          +

          Expression Annotator

          + +
          +
          +
          +
          + +
          +
          +
          +
          +
          + +
          +
          + +
          +
          +
          +
          +
          + +
          +
          + +
          +
          +
          - - - - -
          +
          +
          +
          +

          Previous Annotations

          + + + + + + + + + + +
          DateAuthorTextError CategoryError Name
          +
          +
          +
          - +
          diff --git a/js/getText.js b/js/getText.js index ac5f42f..e9647eb 100644 --- a/js/getText.js +++ b/js/getText.js @@ -1,9 +1,15 @@ + $(function(){ - $("#highlightrange").on('mouseup', function(e) { - var value = (document.all) ? document.selection.createRange().text : document.getSelection(); - if (String(value).length != 0) { - $("#expression").val(value); - } + var clickValidArea = false; + + + $("div[name='highlightrange']").on("click", function(e){ + $("div[name='highlightrange']").on('mouseup', function(e) { + var value = (document.all) ? document.selection.createRange().text : document.getSelection(); + + if ( (String(value).length)) + $("#expression").val(value); + }); }); }); \ No newline at end of file diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php index 4a4ec22..0adb1a3 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php @@ -37,7 +37,7 @@ $last_names[] = sqlsrv_get_field($coursestudents, 2); } - $expressiondataSQL = "SELECT E.Expression, E.[Context/Vocabulary], E.Pronunciation, S.StudentID, S.FirstName, S.LastName, E.AllDo + $expressiondataSQL = "SELECT E.Expression, E.[Context/Vocabulary], E.Pronunciation, S.StudentID, S.FirstName, S.LastName, E.AllDo, E.[SentenceNumber] FROM Expressions E, Students S WHERE E.ExpressionID = ? AND S.StudentID = E.StudentID"; @@ -53,6 +53,7 @@ $selected_first_name = sqlsrv_get_field($expressiondata, 4); $selected_last_name = sqlsrv_get_field($expressiondata, 5); $alldo = sqlsrv_get_field($expressiondata, 6); + $sentence_number = sqlsrv_get_field($expressiondata, 7); } } @@ -62,6 +63,9 @@
          +
          +

          $sentence_number

          +
          -
          -
          - -
          -
          +
          From 8802b10ae9fb1137061002390860b62768b58091 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Thu, 7 Apr 2016 17:46:47 -0700 Subject: [PATCH 197/256] AnnotationEditor updates for Admin: data passing with real data, and UI adjustment; small changes on teacher pages --- .../ViewWorksheet/AnnotationEditor/index.php | 178 ++++++++++-------- js/getText.js | 11 +- .../WorksheetEditor/PopulateEditor.php | 10 +- .../ViewCourse/WorksheetEditor/index.php | 4 +- teacher/MyCourses/ViewCourse/index.php | 2 +- 5 files changed, 114 insertions(+), 91 deletions(-) diff --git a/admin/Archive/Courses/ViewCourse/ViewWorksheet/AnnotationEditor/index.php b/admin/Archive/Courses/ViewCourse/ViewWorksheet/AnnotationEditor/index.php index bcd797e..e39bb65 100644 --- a/admin/Archive/Courses/ViewCourse/ViewWorksheet/AnnotationEditor/index.php +++ b/admin/Archive/Courses/ViewCourse/ViewWorksheet/AnnotationEditor/index.php @@ -47,6 +47,36 @@ else { $courseID = isset($_GET['courseID']) ? $_GET['courseID'] : 0; + $worksheetID = 3572; + $params = array($worksheetID); + $options = array("Scrollable" => 'static'); + $worksheetexpressionsSQL = "SELECT E.Expression, E.[Context/Vocabulary], E.SentenceNumber, E.ExpressionID, S.FirstName, S.LastName, S.StudentID + FROM Expressions E, Worksheets W, Students S + WHERE W.WorksheetID = ? AND + E.WorksheetID = W.WorksheetID AND + S.StudentID = E.StudentID + ORDER BY W.WorksheetNumber"; + $worksheetexpressions = sqlsrv_query($con, $worksheetexpressionsSQL, $params, $options); + if ($worksheetexpressions === false) + die(print_r(sqlsrv_errors(), true)); + $num_expressions = sqlsrv_num_rows($worksheetexpressions); + $expressions = []; + $contexts = []; + $numbers = []; + $expressionids = []; + $firstnames = []; + $lastnames = []; + $studentids = []; + while (sqlsrv_fetch($worksheetexpressions) === true) + { + $expressions[] = sqlsrv_get_field($worksheetexpressions, 0); + $contexts[] = sqlsrv_get_field($worksheetexpressions, 1); + $numbers[] = sqlsrv_get_field($worksheetexpressions, 2); + $expressionids[] = sqlsrv_get_field($worksheetexpressions, 3); + $firstnames[] = sqlsrv_get_field($worksheetexpressions, 4); + $lastnames[] = sqlsrv_get_field($worksheetexpressions, 5); + $studentids[] = sqlsrv_get_field($worksheetexpressions, 6); + } $worksheetNum = isset($_GET['worksheetNum']) ? $_GET['worksheetNum'] : 0; if (false) echo ""; @@ -94,15 +124,34 @@
          		Student Expression Context/VocabNumber of Annotations
          1NameHere's a expressionSome Context + + + + +
          + + +           		0
          @@ -111,52 +160,13 @@
          -
          +

          Editor

          -
          - - - - - - - - - - - - - - - - - - - - - - - -
          #Expression
          1 -
          - Here's a expression -
          -
          2 -
          - Another Expressions -
          -
          3 -
          - Yet another expressive -
          -
          -
          - -
          -

          Expression Annotator

          +
          +

          Expression Annotator ( # )

          -
          -
          - -
          -
          -
          -
          -
          - -
          -
          - +
          + +
          +
          +
          +
          + +
          -
          -
          -
          -
          - +
          +
          +
          + +
          +
          + +
          -
          - +
          +
          +
          + +
          +
          + +
          -
          +
          -
          diff --git a/js/getText.js b/js/getText.js index e9647eb..74a4360 100644 --- a/js/getText.js +++ b/js/getText.js @@ -7,9 +7,18 @@ $(function(){ $("div[name='highlightrange']").on('mouseup', function(e) { var value = (document.all) ? document.selection.createRange().text : document.getSelection(); + var expressionid = $(this).closest("td").find("input[name='expressionid']").val(); + var expressionnumber = $(this).closest("td").find("input[name='expressionnumber']").val(); if ( (String(value).length)) - $("#expression").val(value); + { + $("#editorexpression").val(value); + $("#editorexpressionid").val(expressionid); + $("#editorexpressionnumber").empty(); + $("#editorexpressionnumber").append(expressionnumber); + } + + }); }); }); \ No newline at end of file diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php index 0adb1a3..a2fa879 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/PopulateEditor.php @@ -1,5 +1,5 @@
          -
          -

          $sentence_number

          -
          +
          +

          Sentence #$sentence_number

          +
          "; if ($alldo == 1) diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php index ea75bf7..ec0bf17 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -136,7 +136,7 @@
          -
          +
          Worksheet Info

          Course: Generated from page

          @@ -147,7 +147,7 @@
          -
          +
          Worksheet Overview
          diff --git a/teacher/MyCourses/ViewCourse/index.php b/teacher/MyCourses/ViewCourse/index.php index f46572c..bfe6c74 100644 --- a/teacher/MyCourses/ViewCourse/index.php +++ b/teacher/MyCourses/ViewCourse/index.php @@ -129,7 +129,7 @@
          -
          +

          Worksheet #

          From 5d90bc642c03a7f802977f05e01278a1fd6c11e1 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Sat, 9 Apr 2016 16:58:57 -0700 Subject: [PATCH 198/256] Teacher function: Add worksheet --- .../MyCourses/ViewCourse/CreateWorksheet.php | 78 +++++++++++++++++++ teacher/MyCourses/ViewCourse/index.php | 63 ++++++++++++--- 2 files changed, 131 insertions(+), 10 deletions(-) create mode 100644 teacher/MyCourses/ViewCourse/CreateWorksheet.php diff --git a/teacher/MyCourses/ViewCourse/CreateWorksheet.php b/teacher/MyCourses/ViewCourse/CreateWorksheet.php new file mode 100644 index 0000000..11ca62f --- /dev/null +++ b/teacher/MyCourses/ViewCourse/CreateWorksheet.php @@ -0,0 +1,78 @@ + 'static'); + $addTopicSQL = "INSERT into Topics Values (?)"; + $getTopicIDSQL = "SELECT TOP 1 TopicID FROM Topics + WHERE Topic = ? + ORDER BY TopicID Desc"; + $TopicID = 0; + $addTopic = sqlsrv_query($con, $addTopicSQL, $params, $options); + if($addTopic === false) + die(print_r(sqlsrv_errors(), true)); + + $getTopicID = sqlsrv_query($con, $getTopicIDSQL, $params, $options); + if($getTopicID === false) + die(print_r(sqlsrv_errors(), true)); + if(sqlsrv_fetch($getTopicID) === true) + $TopicID = sqlsrv_get_field($getTopicID, 0); + return $TopicID; +} + +if ((isset($_POST['worksheet_number'])) && (isset($_POST['topic']))) +{ + $original = isset($_POST['worksheetTypeOriginal']) ? $_POST['worksheetTypeOriginal'] : 'off'; + $text_ref = isset($_POST['worksheetTypeText']) ? $_POST['worksheetTypeText'] : 'off'; + $audio_ref = isset($_POST['worksheetTypeAudio']) ? $_POST['worksheetTypeAudio'] : 'off'; + + + $original_bool = 0; + $text_ref_bool = 0; + $audio_ref_bool = 0; + if ($original != 'off') + $original_bool = 1; + if ($text_ref != 'off') + $text_ref_bool = 1; + if ($audio_ref != 'off') + $audio_ref_bool = 1; + + $params = array($_POST['topic']); + $options = array( "Scrollable" => 'static'); + $addTopicSQL = "INSERT into Topics Values (?)"; + $getTopicIDSQL = "SELECT TOP 1 TopicID FROM Topics + WHERE Topic = ? + ORDER BY TopicID Desc"; + $TopicID = 887; + $addTopic = sqlsrv_query($con, $addTopicSQL, $params, $options); + if($addTopic === false) + die(print_r(sqlsrv_errors(), true)); + + $getTopicID = sqlsrv_query($con, $getTopicIDSQL, $params, $options); + if($getTopicID === false) + die(print_r(sqlsrv_errors(), true)); + if(sqlsrv_fetch($getTopicID) === true) + $TopicID = sqlsrv_get_field($getTopicID, 0); + + $params = array($_POST['courseid'], $_POST['worksheet_number'], $TopicID, $original_bool, $text_ref_bool, $audio_ref_bool); + $options = array( "Scrollable" => 'static'); + + $newworksheetSQL = "INSERT INTO Worksheets ( + [Date] + ,[CourseID] + ,[WorksheetNumber] + ,[EditStatus] + ,[TopicID] + ,[DisplayOriginal] + ,[DisplayTextReformulation] + ,[DisplayAudioReformulation]) VALUES (GETDATE(), ?, ?, 'Unreleased', ?, ?, ?, ?)"; + + $newworksheet = sqlsrv_query($con, $newworksheetSQL, $params, $options); + if($newworksheet === false) + die(print_r(sqlsrv_errors(), true)); +} + +?> \ No newline at end of file diff --git a/teacher/MyCourses/ViewCourse/index.php b/teacher/MyCourses/ViewCourse/index.php index bfe6c74..7208625 100644 --- a/teacher/MyCourses/ViewCourse/index.php +++ b/teacher/MyCourses/ViewCourse/index.php @@ -88,9 +88,11 @@ $Section = sqlsrv_get_field( $courseinfo, 4); } $WorksheetsSQL = " - SELECT WorksheetID, WorksheetNumber, EditStatus, CONVERT(VARCHAR(11), Date,106) - FROM Worksheets - WHERE CourseID = ? ORDER BY WorksheetNumber"; + SELECT W.WorksheetID, W.WorksheetNumber, W.EditStatus, CONVERT(VARCHAR(11), W.Date,106), T.Topic + FROM Worksheets W, Topics T + WHERE W.CourseID = ? AND + T.TopicID = W.TopicID + ORDER BY W.WorksheetNumber"; $params = array($courseID); $options = array( "Scrollable" => SQLSRV_CURSOR_KEYSET); $worksheets = sqlsrv_query($con, $WorksheetsSQL, $params, $options); @@ -104,12 +106,14 @@ $worksheet_numbers = []; $statuses = []; $dates = []; + $topics = []; while(sqlsrv_fetch($worksheets) === true) { $worksheetIDs[] = sqlsrv_get_field($worksheets, 0); $worksheet_numbers[] = sqlsrv_get_field($worksheets, 1); $statuses[] = sqlsrv_get_field($worksheets, 2); $dates[] = sqlsrv_get_field($worksheets, 3); + $topics[] = sqlsrv_get_field($worksheets, 4); } echo "

          Name: $ClassName

          @@ -125,7 +129,8 @@
          - + +
          @@ -135,24 +140,24 @@
          - +

          My Students Will See:

          - +
          - +
          - +
          - - + +
          @@ -235,6 +240,7 @@ # Date + Topic Status Go To Perform an Action @@ -248,6 +254,7 @@ echo ""; echo "$worksheet_numbers[$i]"; echo "$dates[$i]"; + echo "$topics[$i]"; echo "$statuses[$i]"; if ($statuses[$i] == "Released") { @@ -296,6 +303,42 @@ e.preventDefault(); $("#wrapper").toggleClass("toggled"); }); + $("button[name='newworksheet']").on("click", function() { + var topic = $("input[name='topic']").val(); + var courseid = $("input[name='courseid']").val(); + var worksheetnumber = $("input[name='worksheet_number']").val(); + var original = $("input[name='worksheetTypeOriginal']").val(); + var text = $("input[name='worksheetTypeText']").val(); + var audio = $("input[name='worksheetTypeAudio']").val(); + + + $.ajax({ + type: "POST", + url: "CreateWorksheet.php", + data: { + "topic":topic, + "worksheet_number":worksheetnumber, + "worksheetTypeOriginal":original, + "worksheetTypeText":text, + "worksheetTypeAudio":audio, + "courseid":courseid + }, + success: function(data){ + var courseID = $("#courseID").val(); + $.ajax({ + type: "POST", + url: "index.php", + data: { + "courseID":courseID + }, + success: function(data) { + location.reload(); + } + + }); + } + }); + }); Date: Sat, 9 Apr 2016 16:59:10 -0700 Subject: [PATCH 199/256] Manage Admins UI change --- admin/ManageAdmins/index.php | 91 ++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 35 deletions(-) diff --git a/admin/ManageAdmins/index.php b/admin/ManageAdmins/index.php index e9caca2..c16730c 100644 --- a/admin/ManageAdmins/index.php +++ b/admin/ManageAdmins/index.php @@ -43,27 +43,34 @@ { $params = array(); $options = array( "Scrollable" => 'static'); - $adminsQuery = " - SELECT I.InstitutionName, A.FirstName, A.LastName, R.Designation - FROM Institutions as I, Administrators as A, RoleInstances as RI, Roles as R + $adminsSQL = " + SELECT I.InstitutionName, A.FirstName, A.LastName, A.AdministratorID, R.Designation, CONVERT(VARCHAR(11), SU.date_added, 106) + FROM Institutions as I, Administrators as A, RoleInstances as RI, Roles as R, SiteUsers as SU WHERE A.RoleInstanceID = RI.RoleInstanceID AND + SU.username = A.SiteUsername AND RI.RoleID = R.RoleID AND R.Role = 'Admin' AND I.InstitutionID = A.InstitutionID"; - $stmt = sqlsrv_query($con, $adminsQuery, $params, $options); - if ($stmt === false) + $admins = sqlsrv_query($con, $adminsSQL, $params, $options); + if ($admins === false) die(print_r(sqlsrv_errors(), true)); - while (sqlsrv_fetch($stmt) === true) + $num_admins = sqlsrv_num_rows($admins); + $institutions = []; + $fnames = []; + $lnames = []; + $adminids = []; + $designations = []; + $dates = []; + + while (sqlsrv_fetch($admins) === true) { - $institution = sqlsrv_get_field($stmt, 0); - $fname = sqlsrv_get_field($stmt, 1); - $lname = sqlsrv_get_field($stmt, 2); - $designation = sqlsrv_get_field($stmt, 3); + $institutions[] = sqlsrv_get_field($admins, 0); + $fnames[] = sqlsrv_get_field($admins, 1); + $lnames[] = sqlsrv_get_field($admins, 2); + $adminids[] = sqlsrv_get_field($admins, 3); + $designations[] = sqlsrv_get_field($admins, 4); + $dates[] = sqlsrv_get_field($admins, 5); - /* echo ""; - echo "$institution"; - echo "$fname $lname"; - echo "$designation";*/ } ?> @@ -85,9 +92,10 @@
          -
          +
          -
          +

          +
          -
          +
          -
          +
          Admins
          @@ -148,19 +157,31 @@ - - - - + + + + + - - - - - + + + + + + + "; + } +?> +
          InstitutionNameDate AddedVisit PageInstitutionNameDesignationDate AddedVisit Page
          Gonzaga UniversityT. Cher3/3/2016View Admin -
          $institutions[$i]$fnames[$i] $lnames[$i]$designations[$i]$dates[$i]
          + + +
          +
          From 3b693c116f6508443f8183e26a238808fb5cec73 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Sat, 9 Apr 2016 19:14:31 -0700 Subject: [PATCH 200/256] Finishing touches on create and delete worksheets (still needs error catching for worksheet number control w/in DB --- js/spin.js | 377 ++++++++++++++++++ .../MyCourses/ViewCourse/CreateWorksheet.php | 2 + .../MyCourses/ViewCourse/DeleteWorksheet.php | 13 + teacher/MyCourses/ViewCourse/index.php | 116 +++++- 4 files changed, 497 insertions(+), 11 deletions(-) create mode 100644 js/spin.js create mode 100644 teacher/MyCourses/ViewCourse/DeleteWorksheet.php diff --git a/js/spin.js b/js/spin.js new file mode 100644 index 0000000..1a3258d --- /dev/null +++ b/js/spin.js @@ -0,0 +1,377 @@ +/** + * Copyright (c) 2011-2014 Felix Gnass + * Licensed under the MIT license + * http://spin.js.org/ + * + * Example: + var opts = { + lines: 12 // The number of lines to draw + , length: 7 // The length of each line + , width: 5 // The line thickness + , radius: 10 // The radius of the inner circle + , scale: 1.0 // Scales overall size of the spinner + , corners: 1 // Roundness (0..1) + , color: '#000' // #rgb or #rrggbb + , opacity: 1/4 // Opacity of the lines + , rotate: 0 // Rotation offset + , direction: 1 // 1: clockwise, -1: counterclockwise + , speed: 1 // Rounds per second + , trail: 100 // Afterglow percentage + , fps: 20 // Frames per second when using setTimeout() + , zIndex: 2e9 // Use a high z-index by default + , className: 'spinner' // CSS class to assign to the element + , top: '50%' // center vertically + , left: '50%' // center horizontally + , shadow: false // Whether to render a shadow + , hwaccel: false // Whether to use hardware acceleration (might be buggy) + , position: 'absolute' // Element positioning + } + var target = document.getElementById('foo') + var spinner = new Spinner(opts).spin(target) + */ +;(function (root, factory) { + + /* CommonJS */ + if (typeof module == 'object' && module.exports) module.exports = factory() + + /* AMD module */ + else if (typeof define == 'function' && define.amd) define(factory) + + /* Browser global */ + else root.Spinner = factory() +}(this, function () { + "use strict" + + var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */ + , animations = {} /* Animation rules keyed by their name */ + , useCssAnimations /* Whether to use CSS animations or setTimeout */ + , sheet /* A stylesheet to hold the @keyframe or VML rules. */ + + /** + * Utility function to create elements. If no tag name is given, + * a DIV is created. Optionally properties can be passed. + */ + function createEl (tag, prop) { + var el = document.createElement(tag || 'div') + , n + + for (n in prop) el[n] = prop[n] + return el + } + + /** + * Appends children and returns the parent. + */ + function ins (parent /* child1, child2, ...*/) { + for (var i = 1, n = arguments.length; i < n; i++) { + parent.appendChild(arguments[i]) + } + + return parent + } + + /** + * Creates an opacity keyframe animation rule and returns its name. + * Since most mobile Webkits have timing issues with animation-delay, + * we create separate rules for each line/segment. + */ + function addAnimation (alpha, trail, i, lines) { + var name = ['opacity', trail, ~~(alpha * 100), i, lines].join('-') + , start = 0.01 + i/lines * 100 + , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha) + , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase() + , pre = prefix && '-' + prefix + '-' || '' + + if (!animations[name]) { + sheet.insertRule( + '@' + pre + 'keyframes ' + name + '{' + + '0%{opacity:' + z + '}' + + start + '%{opacity:' + alpha + '}' + + (start+0.01) + '%{opacity:1}' + + (start+trail) % 100 + '%{opacity:' + alpha + '}' + + '100%{opacity:' + z + '}' + + '}', sheet.cssRules.length) + + animations[name] = 1 + } + + return name + } + + /** + * Tries various vendor prefixes and returns the first supported property. + */ + function vendor (el, prop) { + var s = el.style + , pp + , i + + prop = prop.charAt(0).toUpperCase() + prop.slice(1) + if (s[prop] !== undefined) return prop + for (i = 0; i < prefixes.length; i++) { + pp = prefixes[i]+prop + if (s[pp] !== undefined) return pp + } + } + + /** + * Sets multiple style properties at once. + */ + function css (el, prop) { + for (var n in prop) { + el.style[vendor(el, n) || n] = prop[n] + } + + return el + } + + /** + * Fills in default values. + */ + function merge (obj) { + for (var i = 1; i < arguments.length; i++) { + var def = arguments[i] + for (var n in def) { + if (obj[n] === undefined) obj[n] = def[n] + } + } + return obj + } + + /** + * Returns the line color from the given string or array. + */ + function getColor (color, idx) { + return typeof color == 'string' ? color : color[idx % color.length] + } + + // Built-in defaults + + var defaults = { + lines: 12 // The number of lines to draw + , length: 7 // The length of each line + , width: 5 // The line thickness + , radius: 10 // The radius of the inner circle + , scale: 1.0 // Scales overall size of the spinner + , corners: 1 // Roundness (0..1) + , color: '#000' // #rgb or #rrggbb + , opacity: 1/4 // Opacity of the lines + , rotate: 0 // Rotation offset + , direction: 1 // 1: clockwise, -1: counterclockwise + , speed: 1 // Rounds per second + , trail: 100 // Afterglow percentage + , fps: 20 // Frames per second when using setTimeout() + , zIndex: 2e9 // Use a high z-index by default + , className: 'spinner' // CSS class to assign to the element + , top: '50%' // center vertically + , left: '50%' // center horizontally + , shadow: false // Whether to render a shadow + , hwaccel: false // Whether to use hardware acceleration (might be buggy) + , position: 'absolute' // Element positioning + } + + /** The constructor */ + function Spinner (o) { + this.opts = merge(o || {}, Spinner.defaults, defaults) + } + + // Global defaults that override the built-ins: + Spinner.defaults = {} + + merge(Spinner.prototype, { + /** + * Adds the spinner to the given target element. If this instance is already + * spinning, it is automatically removed from its previous target b calling + * stop() internally. + */ + spin: function (target) { + this.stop() + + var self = this + , o = self.opts + , el = self.el = createEl(null, {className: o.className}) + + css(el, { + position: o.position + , width: 0 + , zIndex: o.zIndex + , left: o.left + , top: o.top + }) + + if (target) { + target.insertBefore(el, target.firstChild || null) + } + + el.setAttribute('role', 'progressbar') + self.lines(el, self.opts) + + if (!useCssAnimations) { + // No CSS animation support, use setTimeout() instead + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , alpha + , fps = o.fps + , f = fps / o.speed + , ostep = (1 - o.opacity) / (f * o.trail / 100) + , astep = f / o.lines + + ;(function anim () { + i++ + for (var j = 0; j < o.lines; j++) { + alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity) + + self.opacity(el, j * o.direction + start, alpha, o) + } + self.timeout = self.el && setTimeout(anim, ~~(1000 / fps)) + })() + } + return self + } + + /** + * Stops and removes the Spinner. + */ + , stop: function () { + var el = this.el + if (el) { + clearTimeout(this.timeout) + if (el.parentNode) el.parentNode.removeChild(el) + this.el = undefined + } + return this + } + + /** + * Internal method that draws the individual lines. Will be overwritten + * in VML fallback mode below. + */ + , lines: function (el, o) { + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , seg + + function fill (color, shadow) { + return css(createEl(), { + position: 'absolute' + , width: o.scale * (o.length + o.width) + 'px' + , height: o.scale * o.width + 'px' + , background: color + , boxShadow: shadow + , transformOrigin: 'left' + , transform: 'rotate(' + ~~(360/o.lines*i + o.rotate) + 'deg) translate(' + o.scale*o.radius + 'px' + ',0)' + , borderRadius: (o.corners * o.scale * o.width >> 1) + 'px' + }) + } + + for (; i < o.lines; i++) { + seg = css(createEl(), { + position: 'absolute' + , top: 1 + ~(o.scale * o.width / 2) + 'px' + , transform: o.hwaccel ? 'translate3d(0,0,0)' : '' + , opacity: o.opacity + , animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1 / o.speed + 's linear infinite' + }) + + if (o.shadow) ins(seg, css(fill('#000', '0 0 4px #000'), {top: '2px'})) + ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)'))) + } + return el + } + + /** + * Internal method that adjusts the opacity of a single line. + * Will be overwritten in VML fallback mode below. + */ + , opacity: function (el, i, val) { + if (i < el.childNodes.length) el.childNodes[i].style.opacity = val + } + + }) + + + function initVML () { + + /* Utility function to create a VML tag */ + function vml (tag, attr) { + return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr) + } + + // No CSS transforms but VML support, add a CSS rule for VML elements: + sheet.addRule('.spin-vml', 'behavior:url(#default#VML)') + + Spinner.prototype.lines = function (el, o) { + var r = o.scale * (o.length + o.width) + , s = o.scale * 2 * r + + function grp () { + return css( + vml('group', { + coordsize: s + ' ' + s + , coordorigin: -r + ' ' + -r + }) + , { width: s, height: s } + ) + } + + var margin = -(o.width + o.length) * o.scale * 2 + 'px' + , g = css(grp(), {position: 'absolute', top: margin, left: margin}) + , i + + function seg (i, dx, filter) { + ins( + g + , ins( + css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}) + , ins( + css( + vml('roundrect', {arcsize: o.corners}) + , { width: r + , height: o.scale * o.width + , left: o.scale * o.radius + , top: -o.scale * o.width >> 1 + , filter: filter + } + ) + , vml('fill', {color: getColor(o.color, i), opacity: o.opacity}) + , vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change + ) + ) + ) + } + + if (o.shadow) + for (i = 1; i <= o.lines; i++) { + seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)') + } + + for (i = 1; i <= o.lines; i++) seg(i) + return ins(el, g) + } + + Spinner.prototype.opacity = function (el, i, val, o) { + var c = el.firstChild + o = o.shadow && o.lines || 0 + if (c && i + o < c.childNodes.length) { + c = c.childNodes[i + o]; c = c && c.firstChild; c = c && c.firstChild + if (c) c.opacity = val + } + } + } + + if (typeof document !== 'undefined') { + sheet = (function () { + var el = createEl('style', {type : 'text/css'}) + ins(document.getElementsByTagName('head')[0], el) + return el.sheet || el.styleSheet + }()) + + var probe = css(createEl('group'), {behavior: 'url(#default#VML)'}) + + if (!vendor(probe, 'transform') && probe.adj) initVML() + else useCssAnimations = vendor(probe, 'animation') + } + + return Spinner + +})); diff --git a/teacher/MyCourses/ViewCourse/CreateWorksheet.php b/teacher/MyCourses/ViewCourse/CreateWorksheet.php index 11ca62f..5b93822 100644 --- a/teacher/MyCourses/ViewCourse/CreateWorksheet.php +++ b/teacher/MyCourses/ViewCourse/CreateWorksheet.php @@ -56,6 +56,8 @@ function get_topic_id($topic) die(print_r(sqlsrv_errors(), true)); if(sqlsrv_fetch($getTopicID) === true) $TopicID = sqlsrv_get_field($getTopicID, 0); + if (strlen($_POST['topic']) == 0) + $TopicID = 887; $params = array($_POST['courseid'], $_POST['worksheet_number'], $TopicID, $original_bool, $text_ref_bool, $audio_ref_bool); $options = array( "Scrollable" => 'static'); diff --git a/teacher/MyCourses/ViewCourse/DeleteWorksheet.php b/teacher/MyCourses/ViewCourse/DeleteWorksheet.php new file mode 100644 index 0000000..815cf8c --- /dev/null +++ b/teacher/MyCourses/ViewCourse/DeleteWorksheet.php @@ -0,0 +1,13 @@ + 'static' ); + $deleteworksheetSQL = "DELETE FROM Worksheets WHERE WorksheetID = ?"; + $deleteworksheet = sqlsrv_query($con, $deleteworksheetSQL, $params, $options); + if ($deleteworksheet === false) + die(print_r(sqlsrv_errors(), true)); +} \ No newline at end of file diff --git a/teacher/MyCourses/ViewCourse/index.php b/teacher/MyCourses/ViewCourse/index.php index 7208625..34f1492 100644 --- a/teacher/MyCourses/ViewCourse/index.php +++ b/teacher/MyCourses/ViewCourse/index.php @@ -19,6 +19,7 @@ + @@ -29,7 +29,6 @@ }); - 'static' ); - $stmt = sqlsrv_query($con, $teacherIDQuery, $params, $options); - if( $stmt === false ) { - die( print_r( sqlsrv_errors(), true)); - } - - $teacherID = 0; - if ( sqlsrv_fetch( $stmt ) === true) - $teacherID = sqlsrv_get_field( $stmt, 0); - else - echo "SQL ERROR";*/ - - if ($institutionID == 0) - { - $params = array($_SESSION['Username']); - $options = array( "Scrollable" => 'static' ); - $CoursesQuery = " - SELECT C.CourseID, CT.CourseName, C.Section, ST.SessionName, SI.Year - FROM Courses as C, [CourseTypes] as CT, [SessionType] as ST, SessionInstance as SI, TeachingInstance as TI - WHERE TI.SiteUsername = ? AND - C.TeachingInstanceID = TI.TeachingInstanceID AND - C.Status = 'Active' AND - CT.CourseTypesID = C.CourseTypesID AND - SI.SessionInstanceID = C.SessionInstanceID AND - ST.SessionTypeID = SI.SessionTypeID"; - } - else - { - $params = array($_SESSION['Username'], $institutionID); - $options = array( "Scrollable" => 'static' ); - $CoursesQuery = " - SELECT C.CourseID, CT.CourseName, C.Section, ST.SessionName, SI.Year - FROM Courses as C, [CourseTypes] as CT, [SessionType] as ST, SessionInstance as SI, TeachingInstance TI - WHERE TI.SiteUsername= ? AND - C.TeachingInstanceID = TI.TeachingInstanceID AND - C.Status = 'Active' AND - C.InstitutionID = ? AND - CT.CourseTypesID = C.CourseTypesID AND - SI.SessionInstanceID = C.SessionInstanceID AND - ST.SessionTypeID = SI.SessionTypeID"; - } - - $stmt = sqlsrv_query($con, $CoursesQuery, $params, $options); + $UserInfoQuery = " + SELECT R.Designation + FROM RoleInstances as RI, Roles as R + WHERE RI.SiteUsername = ? AND + R.Role = ? AND + R.RoleID = RI.RoleID"; + $stmt = sqlsrv_query($con, $UserInfoQuery, $params, $options); if ( $stmt === false) die( print_r( sqlsrv_errors(), true)); - $length = sqlsrv_num_rows($stmt); - - $courseID = []; - $ClassNames = []; - $Sections = []; - $SessionNames = []; - $SessionYears = []; - - while (sqlsrv_fetch( $stmt ) === true) - { - $courseID[] = sqlsrv_get_field( $stmt, 0); - $ClassNames[] = sqlsrv_get_field( $stmt, 1); - $Sections[] = sqlsrv_get_field( $stmt, 2); - $SessionNames[] = sqlsrv_get_field( $stmt, 3); - $SessionYears[] = sqlsrv_get_field( $stmt, 4); - } - - $params = array($_SESSION['Username']); - $institutionsQuery = "SELECT DISTINCT I.InstitutionName, I.InstitutionID FROM Institutions as I, TeachingInstance as TI WHERE TI.SiteUsername = ? AND I.InstitutionID = TI.InstitutionID"; - $stmt = sqlsrv_query( $con, $institutionsQuery, $params, $options); - if ($stmt === false) - die (print_r(sqlsrv(errors(), true))); - $num_institutions = sqlsrv_num_rows($stmt); - $institutions = []; - $institutionsIDs = []; - while (sqlsrv_fetch($stmt) === true) + $Designation = ""; + $Institution = ""; + if ( sqlsrv_fetch( $stmt ) === true) { - $institutions[] = sqlsrv_get_field( $stmt, 0); - $institutionIDs[] = sqlsrv_get_field( $stmt, 1); + $Designation = sqlsrv_get_field( $stmt, 0); } - - ?> - - -
          - -
          - - - -
          -
          -
          -

          My Courses

          + ?> + + +
          + +
          + +
          +
          +
          +

          + +
          -
          - 1) - { - ?> -
          -
          -
          -
          - Filter Courses +
          + +
          +
          +
          +
          +
          +

          Active Courses

          +
          +
          +
          +
          + + + + + + + + + + + + + SQLSRV_CURSOR_KEYSET); + + $activecourses = sqlsrv_query($con, $activecoursesSQL, $params, $options); + if($activecourses === false) + die (print_r(sqlsrv_errors(), true)); + $resultlength = sqlsrv_num_rows($activecourses); + if($resultlength == 0) + { + echo "No Active Courses!"; + } + else + { + $coursenames = []; + $sections = []; + $institutions = []; + $sessions = []; + $courseids = []; + while(sqlsrv_fetch($activecourses) === true) + { + $coursenames[] = sqlsrv_get_field($activecourses, 0); + $sections[] = sqlsrv_get_field($activecourses, 1); + $institutions[] = sqlsrv_get_field($activecourses, 2); + $sessions[] = sqlsrv_get_field($activecourses, 3); + $courseids[] = sqlsrv_get_field($activecourses, 4); + } + for ($i = 0; $i < $resultlength; $i++) + { + echo ""; + } + } + + ?> + +
          CourseSectionSessionInstitutionGo To
          $coursenames[$i]$sections[$i]$sessions[$i]$institutions[$i]
          +
          +
          -
          -
          -
          -
          - - +
          +
          +
          +
          +
          +
          +

          My Students

          -
          - - +
          +
          + + + + + + + + + + + + + SQLSRV_CURSOR_KEYSET); + + $mystudents = sqlsrv_query($con, $mystudentsSQL, $params, $options); + if($mystudents === false) + die (print_r(sqlsrv_errors(), true)); + $resultlength = sqlsrv_num_rows($mystudents); + if($resultlength == 0) + { + echo "No Enrolled Students!"; + } + else + { + $enrollmentids = []; + $studentlastnames = []; + $studentfirstnames = []; + $institutions = []; + $coursenames = []; + $courseids = []; + while(sqlsrv_fetch($mystudents) === true) + { + $enrollmentids[] = sqlsrv_get_field($mystudents, 0); + $studentlastnames[] = sqlsrv_get_field($mystudents, 1); + $studentfirstnames[] = sqlsrv_get_field($mystudents, 2); + $institutions[] = sqlsrv_get_field($mystudents, 3); + $coursenames[] = sqlsrv_get_field($mystudents, 4); + $courseids[] = sqlsrv_get_field($mystudents, 5); + } + for ($i = 0; $i < $resultlength; $i++) + { + echo ""; + } + } + + ?> + +
          NameCourseInstitutionGo To
          $studentfirstnames[$i] $studentlastnames[$i]$coursenames[$i]$institutions[$i]
          +
          +
          +
          -
          - - -
          -
          -
          - -
          - - - - - - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - - }?> - - -
          SessionLevelSectionGo To
          $SessionNames[$i] $SessionYears[$i]$ClassNames[$i]$Sections[$i] -
          - - - - - -
          "; - - echo "
          +
          -
          +
          -
          From 5198dc5a4b26e3e04f923cb6f159b33c9e66bcd5 Mon Sep 17 00:00:00 2001 From: Kevin Wisdom Date: Sun, 10 Apr 2016 17:02:16 -0700 Subject: [PATCH 209/256] fixing whoopsie in html --- .../MyCourses/ViewCourse/Students/ViewStudentProfile/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teacher/MyCourses/ViewCourse/Students/ViewStudentProfile/index.php b/teacher/MyCourses/ViewCourse/Students/ViewStudentProfile/index.php index 1828786..4335c37 100644 --- a/teacher/MyCourses/ViewCourse/Students/ViewStudentProfile/index.php +++ b/teacher/MyCourses/ViewCourse/Students/ViewStudentProfile/index.php @@ -164,7 +164,7 @@ } for ($i = 0; $i < $resultlength; $i++) { - echo "$coursenames[$i]$worksheetnumbers[$i]TBD
          "; + echo "$coursenames[$i]$worksheetnumbers[$i]TBD
          "; } } From 40778e78b932d9617704e184c4b2983b25f5afcf Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Mon, 11 Apr 2016 14:24:50 -0700 Subject: [PATCH 210/256] Final edits to adding and saving expressions --- js/dynamicRowTeacher.js | 9 +++++---- .../ViewCourse/WorksheetEditor/SaveExpression.php | 7 ++++--- teacher/MyCourses/ViewCourse/WorksheetEditor/index.php | 2 +- teacher/MyCourses/ViewCourse/index.php | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/js/dynamicRowTeacher.js b/js/dynamicRowTeacher.js index aacd4b6..3a5ed49 100644 --- a/js/dynamicRowTeacher.js +++ b/js/dynamicRowTeacher.js @@ -50,14 +50,14 @@ $(function(){ $("button[name=NewExpression]").on('click', function(e){ var worksheetID = $(this).val(); var courseID = $(this).closest("form").find("input[name=courseID]").val(); - alert(courseID); var expressionNum = $("input[name=newexpressionnumber]").val(); $.ajax({ type: "POST", url: "NewExpression.php", data: { "worksheetID": worksheetID, - "newexpressionnumber": expressionNum + "newexpressionnumber": expressionNum, + "courseID": courseID }, success: function(data){ @@ -80,7 +80,7 @@ $(function(){ AllDo = 1; var expressionNum = $(parentForm).find("input[name=newexpressionnumber]").val(); var worksheetID = $(parentForm).find("input[name=worksheetID]").val(); - alert(Expression); + var courseID = $(parentForm).find("input[name=courseID]").val(); $.ajax({ type: "POST", url: "SaveExpression.php", @@ -91,7 +91,8 @@ $(function(){ "studentID": studentID, "AllDo": AllDo, "expressionNum": expressionNum, - "worksheetID": worksheetID + "worksheetID": worksheetID, + "courseID": courseID }, success: function(data){ diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/SaveExpression.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/SaveExpression.php index ccb23a8..d515cab 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/SaveExpression.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/SaveExpression.php @@ -2,7 +2,7 @@ include '../../../../base.php'; -if ((isset($_POST['Expression'])) && (isset($_POST['ContextVocab'])) && (isset($_POST['Pronunciation'])) && (isset($_POST['studentID'])) && (isset($_POST['AllDo'])) && (isset($_POST['expressionNum'])) && (isset($_POST['worksheetID']))) +if ((isset($_POST['Expression'])) && (isset($_POST['ContextVocab'])) && (isset($_POST['Pronunciation'])) && (isset($_POST['studentID'])) && (isset($_POST['AllDo'])) && (isset($_POST['expressionNum'])) && (isset($_POST['worksheetID'])) && (isset($_POST['courseID']))) { @@ -13,10 +13,11 @@ $AllDo = $_POST['AllDo']; $Number = $_POST['expressionNum']; $WorksheetID = $_POST['worksheetID']; + $courseID = $_POST['courseID']; - $params = array($StudentID, $Expression, $Pronunciation, $ContextVocab, $Number, $AllDo, $WorksheetID); + $params = array($StudentID, $Expression, $Pronunciation, $ContextVocab, $Number, $courseID, $AllDo, $WorksheetID); $options = array( "Scrollable" => 'static' ); - $writeexpressionSQL = "INSERT INTO Expressions(Date, StudentID, Expression, Pronunciation, [Context/Vocabulary], SentenceNumber, AllDo, WorksheetID) VALUES (GETDATE(), ?, ?, ?, ?, ?, ?, ?)"; + $writeexpressionSQL = "INSERT INTO Expressions(Date, StudentID, Expression, Pronunciation, [Context/Vocabulary], SentenceNumber, CourseID, AllDo, WorksheetID, IsDeleted) VALUES (GETDATE(), ?, ?, ?, ?, ?, ?, ?, ?, 0)"; $writeexpression = sqlsrv_query($con, $writeexpressionSQL, $params, $options); if ($writeexpression === false) die(print_r(sqlsrv_errors(), true)); diff --git a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php index e1c2ddf..96c1374 100644 --- a/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/teacher/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -74,7 +74,7 @@ $worksheetID = isset($_POST['worksheetID']) ? $_POST['worksheetID'] : 0; $courseID = isset($_POST['courseID']) ? $_POST['courseID'] : 0; if (($worksheetID == 0) || ($courseID == 0)) - echo ""; + echo ""; $params = array($worksheetID); $options = array( "Scrollable" => SQLSRV_CURSOR_KEYSET); $worksheetexpressionsSQL = "SELECT E.SentenceNumber, S.StudentID, S.FirstName, S.LastName, E.Expression, E.ExpressionID, E.AllDo diff --git a/teacher/MyCourses/ViewCourse/index.php b/teacher/MyCourses/ViewCourse/index.php index 0aa0bdb..d6b5efb 100644 --- a/teacher/MyCourses/ViewCourse/index.php +++ b/teacher/MyCourses/ViewCourse/index.php @@ -272,7 +272,7 @@ } else { - echo "
          "; + echo "
          "; } echo "
          @@ -284,7 +284,7 @@ echo "
          - +
          "; echo "
          From 78727c5679aac068d361a684f82c66157a158cb2 Mon Sep 17 00:00:00 2001 From: Menezes Date: Mon, 11 Apr 2016 16:42:00 -0700 Subject: [PATCH 211/256] Working changes to worksheeteditor --- js/dynamicRowTeacher.js | 24 +++++++++----- media/logo_1.png | Bin 0 -> 4623 bytes .../WorksheetEditor/PopulateEditor.php | 27 ++++++++------- .../WorksheetEditor/SaveExpression.php | 31 +++++++++++++----- .../ViewCourse/WorksheetEditor/index.php | 10 +++--- 5 files changed, 56 insertions(+), 36 deletions(-) create mode 100644 media/logo_1.png diff --git a/js/dynamicRowTeacher.js b/js/dynamicRowTeacher.js index 3a5ed49..d0c35df 100644 --- a/js/dynamicRowTeacher.js +++ b/js/dynamicRowTeacher.js @@ -29,14 +29,18 @@ $(function(){ $("#PronCorr").val(""); }); - $("button[name=SelectExpression]").on('click', function(e){ - var expressionid = $(this).val(); + $(document).on('click', "button[name='SelectExpression']", function(e){ + var expressionid = $(this).closest("form").find("input[name=expressionID]").val(); + var worksheetid = $(this).closest("form").find("input[name=worksheetID]").val(); var courseid = $(this).closest("form").find("input[name=courseID]").val(); + var newexpressionnumber = $(this).closest("form").find("input[name=newexpressionnumber]").val(); $.ajax({ type: "POST", url: "PopulateEditor.php", - data: {'expressionid' : expressionid, - 'courseID' : courseid + data: {'expressionID' : expressionid, + 'courseID' : courseid, + 'worksheetID' : worksheetid, + 'expressionNum' : newexpressionnumber }, success: function(data){ @@ -44,11 +48,10 @@ $(function(){ $("div[name='ExpressionEditor']").html(data); } }); - $("#loadingicon").empty(); }); - $("button[name=NewExpression]").on('click', function(e){ - var worksheetID = $(this).val(); + $(document).on('click', "button[name='NewExpression']", function(e){ + var worksheetID = $(this).closest("form").find("input[name=worksheetID]").val(); var courseID = $(this).closest("form").find("input[name=courseID]").val(); var expressionNum = $("input[name=newexpressionnumber]").val(); $.ajax({ @@ -69,8 +72,8 @@ $(function(){ $(document).on('click', 'button[name="SaveExpression"]', function(e){ e.preventDefault(); + var parentForm = $(this).closest("form"); - var Expression = $(parentForm).find("input[name=Expression]").val(); var ContextVocab = $(parentForm).find("input[name=ContextVocab]").val(); var Pronunciation = $(parentForm).find("input[name=Pronunciation]").val(); @@ -80,7 +83,9 @@ $(function(){ AllDo = 1; var expressionNum = $(parentForm).find("input[name=newexpressionnumber]").val(); var worksheetID = $(parentForm).find("input[name=worksheetID]").val(); + var courseID = $(parentForm).find("input[name=courseID]").val(); + var expressionID = $(parentForm).find("input[name=expressionID]").val(); $.ajax({ type: "POST", url: "SaveExpression.php", @@ -92,7 +97,8 @@ $(function(){ "AllDo": AllDo, "expressionNum": expressionNum, "worksheetID": worksheetID, - "courseID": courseID + "courseID": courseID, + "expressionID": expressionID }, success: function(data){ diff --git a/media/logo_1.png b/media/logo_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ccfd05d38289b1cb7f0028f2ebb6697e44af6707 GIT binary patch literal 4623 zcmV+q67cPbP))_e88_uO;$KIeD$*=O(H7GyM4-3Gub z0X!bSx&ZD3;5N>!{{iqf0Dk~*9e{5GI9Eh2%IJQ&WFQHs>caqR4B++v9tYrV03Hb7 z&ZcMn|33nForruPHcVB00)UNdUT}`A4PZn2`(D;R=f(3ytpKc- z(AU)fwx5N*q-J7qBJRft2!InQdTpc+HBkB{fDenv$Jh8-uuNV+Ri8nf7|^8NiXWGQ zMdV2TLREb|fa45oQvKWvU{?|ORG=R&ijUaBNcA)1?-z>5*0UZ!hjK2_*YyBiI}1Z1 z2rR1lHURqoSf?X_6Oe8Ma5{kFMdX(q^*eRbKmvsz^d|s&hzNDJs1+`b=%ltU^8`Y% zuX!2R*U7mAglM_a5~2~&Yg+_Ds!HqUQ~=v~+pTI4w*dGOfU^Ls77-Wp)YH%Z#s4E1IT>HBa0P=78cmTX5$BHq5(VBVzfO`hs z;#3jYsrR>=9*`}88f)YR06U1t1v#Cm>T3X;XnrO47Wx=AsXkop50Pg_w{Nj=sOl;J zZwUPUPXO-`k%MyH!4~TY0Cod#E9ag;wqv0&H<5E;KZAhKVF305a9eM%bUJ@bM0Utk zV0B%Mpe7J16=u)Z*MLxwZ=go!(McV7_KyK%r0f5^le;@yM0EdXk;VGfin8-Y?f9wQ8O(i&+`$h&r-2NXYB5yBw z`z}Gqwq*2wK79hA5-pTpJLeNpRmSr?EpU60KOkc6eU|Yd69|WCEccl-Z`sfkEh{08R#Q4||7Ve^5`B5W`MZ z19;E`LTzSO{k;xf2NWr_)9~4-7)?v3~J!diBCxTS5W9Q0tF!Bjp5c zT2_wfgeCMF06U4u=h_HQRlf(|kxm~I2(=Mt5BH7;gc|vS`mltoPuHC=flv=~uX0TP zz#?7!N3=d2Gew>U;F%K$^`OCyx*QP*aV~DwFeIc?$F$8|CT_0;a902m2z4~y+-@om zVk{6-E<){F0Jdr}DI7D|KV_IKp&pdkrppn5&>14~@+R-n({{}D3r!%@L@|kbDiC76 z7_;R=39a0tA0r|w+C1O#%jkH#Sw!gUo7#vZFeC_>#lf7j_3J1@QsU|ZgludKw%ruK z_@SS+-!jlai zu@YdJ%};(Dh8~boVr7nn=j6g|X>=1+k|%@eZUS&AfKx<-+s;m!s&e9UEATwy=HWZI z$)$XkzXJF@0A@O$)rKx*Xb|c`XnlcD&e#UfS1d=b$XaUyW=>KqMRbLTTosd*!(nu_ zpP64-Ld>3Lz#<8$VvW2qt3+ha9Hlh9Mpgae+Pba?j=Q^yPgO}l!szcD8WK9*j};LD z@RDW|>nH#(G-9s0u@I2H0^mR&6iZ}bDKrNHcq)K97TilvBDgY9la_5!n?R^YTniTu zsIM`AP$?*$gcd>w43$Z+#mMg%jY#Od z2p&w(Wnh{+xtO=alaVS$BqiMHcLLjfBJ#o98>;J6^-utBGAC&1?bY?9-r)B6T_qh% zAXFl)`D+K(*P04KBsg5O)_gu8vhBSpV-fSz>@xuN?qiQ^76`d+c&ty3nnxMmjSnt! zAY|JzCd%?Uwx0tyn@PDe{S2V!^WwE33yJSTi)eqFT)P5zw*}A9!e9h1X->|j$*HO@ z2C%aMp3geKE`9-E#}ZaLRsE33-lff*8x8=Hz;XLny$_QsndSY82w?rnLMx(_tp1Xl zK&T9aMxd|3LCDrhMeR#^;HLn1v_pUL4**=FKLx<746+a`@dt-U%|2~OdpUHj+z#>j zgZcm?$3ln+oZAngDvwYJK(qpQ^7huylrpaD_Xo22dHK)G2Sd(fChU@LnFMS{*KF4a zRNVTJi+PbDMbHqDm*q@tRgLvS8kH{+Y$7~7+XHxC09XlJ1T6ZLvf2bfSz@XzpfTuc z6d>fR(GS>1zWONB5ZF^hm^)hAmH>@eA*U4p5g$P3C@rI2z^KM~_CrHjW;zoP-zg%; z*S)c-?#poo7zB9=NPwdMhfd*Zjl`|ino!lxllLa@%&chhwlpfLdJ=$LJn}6Lrzr1l z0-@AWng4x6`Wg)gsj3e^S!<_~c#LD3j_P9pygI`n>uQfcK(65Zb55P|)IO*9n7|1f z+@k%<-A*Myi0}4w03qs1I^TH$#qG~7ImgAS8arA13xIt^gwDHYizN8+`ahHBTSRE( z)!iR+6n4C??#|uz{4UQ(qy&T zEtjeigboJqfWm4UwWm&5BXcgQ5frZ~W`0yv61c^-N-SGM$1)QtlTB6qB**F=0wlS# z4@fM2KbpL{oCg3~rog<01)(ShYqErrs-C+*RmY;Q!9hq>T^}-C08Gzf$V~L8J|yL& z-^V67_rP@OGITw+RY%t3r7jwj|9}Jt6-RWd>LFH5Bt&I1!|$GEATwfRXLoiEzF$R*m)Pir0D) zgq%rA3fR2?Jg0Dr#;px4i;w21dFfR(AjD)xmZPC%lig}c)imX?iG3ZDAfT!|HQ)(@ z+oH9;LN942H6af0L-WD*2y%S(AO6oHi;2tYj2q(3Puy`{z%l6?LILd76N7sVL# zHFFR$0OFw)4{s_9h*el#l5!i=Nx2w=oJq@wUMhpJ0e);t=$Twx45H&bMQu5QP>~=a z7f&EGFPK?4rbnc&nSxNDBv@_uNQs;pgOCG86b1>&8CaO=ugK}^JtI`hs;TADi2}Q@ zgi4eZyLJMh351-vQM4v#$KJ%Uk%a0~0w~)tFX`$a7NzwEj8~c#ojgIS8rhc9s{%MBck+ z_}fCFoIq$sAT)r!I$0A55Tf5Flp9H@HuCR=CTTAqWWW)tZC{P!Isn`I1V@qWMkfMa z6F^8+_X4n6Bubt8aT2*Po{2$@tZvJHzY#zvuyF#RoMiVk_v#$1wSX3MSGB^ffCG;z3g#vj$T&$nwxAP>~{M-7z=hKN}cw^i`AL&D+T} zLdsaCP}H^_K%)}{cI6YY2yW7cxLikc;4^6P@Dx+x1VZzgm{pw6Nc7do9L`x==Hnut zR>jxlu2;^}3jw^S>2bXeLfOEO0uGxL%)vS$!q%95Y?>peobiltI~MVu73JbgAT&D= z8j-$c212%$w=t?4(%ks1)rpx8LhO7A{bI=iUj&hH3XaJVn*VagxV?**5hoCu4G4`) zUo!6cq7e15ZO2rV)R&C^ zaa$G{ng{k12+hDJG%|e+0zw8vbzJntCuSiK>dZNwSF!Z5hlMT+cLI< zLR>=G7NP^H69~-)gvO+=Awj6q6SEKqb>^H_)mUZMq8j(h5rkBA3jnMT;ye0Cu1{*& zbCT$67fe2({(V9t)Yo7jWY!QX=5}&o76KtYqqTF|j`bLExnW>2U1=O7*W@g;H2{Rj zvs*+eR>Nf2#1blgzAyJ08JBWQ$5<;HZJl%GM}|e1eG(gc-U#*8iJWU#Mw9wVWJYA4 zn8iS-wR2ikN$^f@x?d}d+dVQZk{&Xv^#DSw*~LPMYkLDo3O+R8CiJQ`+|Z@0igk{{ zl8EWpmvsW6|DR-%RdFM44h*HQ!9mC@qShy7F%T*)-sd?=V*_hM1JDBqb)rD$3*3m~ zSyfqjn-ydIwxm>Uz;fZf{JmBYg+Eiae%a`AMTE=-$+k=^p^&4W@7~%HvIRFLeRVR2 z+gL)*{BLz)76T#n&uzi^08S_=-(jV3SyI~P6>0=PrhL{3TLIv99a%1&D6j(%Vjw3I z1lRK3i`7crEFxz{EH5UvvWf>&Jm$<^0QU<3+Jz#rbrON*zw|Ndu+$P_DQj|(`$YsA zS(!Ow&(K3xAT%a@bs}e5udVf!kz;m%i11WxNh1i+Im+5qF-izd@*4nLVI@82&$*<^ zVRCZMIN2Fh$;IF&#&QcrFsm(p<4h(xy+~U@0(kcKP@}LQ2eaEaHpV6}y@4keB-}pF z&#zKd_QM=Dma1h=+Xj*T2$bxP)mT|_hy8sy&>xE(vLAu~|K=ZNy8Df$`b_{B_P`vQ z%iR7FelyC9KD85_Qr0X#%?bw(v28Bo`F*RZaDJ656p$^)cHe+3T-io-l?yuFb2&%&htCb^;lBWWV&kV=sSC>F zijthCf%WCj;YM;U)K@ikzZ+T$USI1Q)pH%GArGXuR=;W$ifLKSgN3S+V2puSn+3jL zx$`1)9YKOGutG#wks{d=<$aR(16cIMO@s;L^mnC*Eac2YVnuTL;Wb={$B78(aOaw; z*6pe5`eio#A(d~fU|i<{IKxV3my~dF$1)e=WtLaSLd})OBH8BNWd24n4fr3W+%Br? z2u>%Jlz19QUt~*YEoW7Y?I?2Pw#c$pRf2gPZ&+Qw3-O44EqYoYdstZ?epP&@a_(S> zc(k03EIDenMHzFD=03Y`5Q>%e$r;}g5VCjXg5m_ZcSa|)O6dEbbDv;Pfmtk8$nTN> z#3~*k&hCuI&s|c15DBmLY4PD|3PPs<*tsFclKYOuAT*G^c#7Ow&Ncp@T)lS*LJMWe zqkKYElb*f@1{Cr{U_C4G;|CscVR2hP)1T%#owVnKC?|5>)V6m_A-J~CRHnJgao+5f z%CYy@l-rV$F`22!{;sdKFg5}CoON=`@i-vCEgUV6;1mdw#7 'static'); $coursestudentsSQL = "SELECT S.StudentID, S.FirstName, S.LastName FROM Expressions as E, Enrollment as ER, Worksheets as W, Courses C, Students S @@ -63,12 +58,16 @@
          + + + +

          Sentence #$sentence_number

          @@ -99,14 +124,17 @@
          Submitted Sentences
          +

          - + Sentence #1 - - +

          From f33e95c67250a9028e3893b7dbb0ceababb87d77 Mon Sep 17 00:00:00 2001 From: BrendanKennedy Date: Wed, 13 Apr 2016 14:16:53 -0700 Subject: [PATCH 213/256] Creating a Course for Admin --- admin/ManageCourses/CreateNewCourse.php | 25 ++++ admin/ManageCourses/index.php | 181 +++++++++++++++++++----- js/CreateNewCourse.js | 25 ++++ js/dynamicRowTeacher.js | 5 +- 4 files changed, 197 insertions(+), 39 deletions(-) create mode 100644 admin/ManageCourses/CreateNewCourse.php create mode 100644 js/CreateNewCourse.js diff --git a/admin/ManageCourses/CreateNewCourse.php b/admin/ManageCourses/CreateNewCourse.php new file mode 100644 index 0000000..e8e138b --- /dev/null +++ b/admin/ManageCourses/CreateNewCourse.php @@ -0,0 +1,25 @@ + 'static' ); + + $createcourseSQL = "INSERT INTO Courses (CourseTypesID, SessionInstanceID, InstitutionID, TeachingInstanceID, Section, Status) + VALUES (?,?,?,?,?,'Active')"; + $createcourse = sqlsrv_query($con, $createcourseSQL, $params, $options); + if ($createcourse === false) + die(print_r(sqlsrv_errors(), true)); +} +else + echo "No data"; +?> \ No newline at end of file diff --git a/admin/ManageCourses/index.php b/admin/ManageCourses/index.php index f9071f2..4483d96 100644 --- a/admin/ManageCourses/index.php +++ b/admin/ManageCourses/index.php @@ -19,16 +19,13 @@ + - - 'static' ); + $institutionSQL = "SELECT I.InstitutionID FROM Institutions as I, Administrators as A + WHERE A.SiteUsername = ? AND + I.InstitutionID = A.InstitutionID"; + $institution = sqlsrv_query($con, $institutionSQL, $params, $options); + if ($institution === false) + die(print_r(sqlsrv_errors(), true)); + if (sqlsrv_fetch($institution) === true) + $institutionID = sqlsrv_get_field($institution, 0); ?>
          @@ -67,44 +74,108 @@
          - -
          - + + + +
          +
          +
          -
          - + + 'static' ); + $coursetypesSQL = "SELECT CourseTypesID, CourseName FROM CourseTypes ORDER BY CourseTypesID"; + $coursetypes = sqlsrv_query($con, $coursetypesSQL, $params, $options); + if ($coursetypes === false) + die(print_r(sqlsrv_errors(), true)); + $num_course_types = sqlsrv_num_rows($coursetypes); + $ids = []; + $levels = []; + while (sqlsrv_fetch($coursetypes) === true) + { + $ids[] = sqlsrv_get_field($coursetypes, 0); + $levels[] = sqlsrv_get_field($coursetypes, 1); + } + for ($i = 0; $i < $num_course_types; $i++) + echo ""; +?>
          -
          - + + +
          +
          - +
          - +
          @@ -128,13 +199,49 @@ - - Gonzaga University - Fall II 2014 - Advanced... - 1 - Hunter - + 'static' ); + $coursesSQL = "SELECT I.InstitutionName, ST.SessionName, SI.Year, CT.CourseName, C.Section, T.FirstName, T.LastName + FROM Institutions I, SessionType ST, SessionInstance SI, CourseTypes CT, Courses C, TeachingInstance TI, Teachers T + WHERE C.Status = 'Active' AND + CT.CourseTypesID = C.CourseTypesID AND + TI.TeachingInstanceID = C.TeachingInstanceID AND + T.TeacherID = TI.TeacherID AND + I.InstitutionID = TI.InstitutionID AND + SI.SessionInstanceID = C.SessionInstanceID AND + ST.SessionTypeID = SI.SessionTypeID + ORDER BY CourseID DESC"; + $courses = sqlsrv_query($con, $coursesSQL, $params, $options); + if ($courses === false) + die(print_r(sqlsrv_errors(), true)); + $num_courses = sqlsrv_num_rows($courses); + $institutions = []; + $session_names = []; + $years = []; + $course_names = []; + $sections = []; + $teacher_firstnames = []; + $teacher_lastnames = []; + while(sqlsrv_fetch($courses) === true) + { + $institutions[] = sqlsrv_get_field($courses, 0); + $session_names[] = sqlsrv_get_field($courses, 1); + $years[] = sqlsrv_get_field($courses, 2); + $course_names[] = sqlsrv_get_field($courses, 3); + $sections[] = sqlsrv_get_field($courses, 4); + $teacher_firstnames[] = sqlsrv_get_field($courses, 5); + $teacher_lastnames[] = sqlsrv_get_field($courses, 6); + } + for ($i = 0; $i < $num_courses; $i++) + { + echo "$institutions[$i] + $session_names[$i] $years[$i] + $course_names[$i] + $sections[$i] + $teacher_firstnames[$i] $teacher_lastnames[$i]"; + } +?>
          diff --git a/js/CreateNewCourse.js b/js/CreateNewCourse.js new file mode 100644 index 0000000..6af62b8 --- /dev/null +++ b/js/CreateNewCourse.js @@ -0,0 +1,25 @@ +$(function(){ + $(document).on('click', "button[name='CreateCourse']", function(e) { + var parentForm = $(this).closest("form"); + var institution = $(parentForm).find("select[name=institution]").val(); + var session = $(parentForm).find("select[name=session]").val(); + var coursename = $(parentForm).find("select[name=coursename]").val(); + var section = $(parentForm).find("select[name=section]").val(); + var teacher = $(parentForm).find("select[name=teacherid]").val(); + alert(teacher); + $.ajax({ + type: "POST", + url: "CreateNewCourse.php", + data: { + "institutionID" : institution, + "sessionID" : session, + "coursetypeID" : coursename, + "section" : section, + "teacherID" : teacher + }, + success: function(data) { + location.reload(); + } + }); + }); +}); diff --git a/js/dynamicRowTeacher.js b/js/dynamicRowTeacher.js index d0c35df..6326355 100644 --- a/js/dynamicRowTeacher.js +++ b/js/dynamicRowTeacher.js @@ -102,9 +102,10 @@ $(function(){ }, success: function(data){ - $("div[name='ExpressionEditor']").empty(); + /*$("div[name='ExpressionEditor']").empty(); $("tbody[name='ExpressionTable']").empty(); - $("tbody[name='ExpressionTable']").html(data); + $("tbody[name='ExpressionTable']").html(data);*/ + location.reload(); } }); }); From 55b4a4e1f8f81a143ef9f36cb7f575b815789880 Mon Sep 17 00:00:00 2001 From: Menezes Date: Wed, 13 Apr 2016 14:31:15 -0700 Subject: [PATCH 214/256] student MyCourses and Smaller updates to worksheet editor --- js/dynamicRowStudent.js | 31 +- .../ViewCourse/WorksheetEditor/index.php | 423 +++++++----------- student/MyCourses/index.php | 54 ++- .../ViewCourse/WorksheetEditor/index.php | 24 - 4 files changed, 231 insertions(+), 301 deletions(-) diff --git a/js/dynamicRowStudent.js b/js/dynamicRowStudent.js index 443c676..ef96efb 100644 --- a/js/dynamicRowStudent.js +++ b/js/dynamicRowStudent.js @@ -20,17 +20,24 @@ $(function(){ $("#CorrectedExpr").val(""); }); - /*$("tr").each(function(index) { - if (index !=0) { - $row = $(this); - - var id = $row.find("td:first").text(); - - if (id.indexOf(value) != 0) { - $(this).hide(); - } else { - $(this).show(); + $(document).on('click', "button[name='SelectExpression']", function(e){ + var expressionid = $(this).closest("form").find("input[name=expressionID]").val(); + var worksheetid = $(this).closest("form").find("input[name=worksheetID]").val(); + var courseid = $(this).closest("form").find("input[name=courseID]").val(); + var newexpressionnumber = $(this).closest("form").find("input[name=newexpressionnumber]").val(); + $.ajax({ + type: "POST", + url: "PopulateEditor.php", + data: {'expressionID' : expressionid, + 'courseID' : courseid, + 'worksheetID' : worksheetid, + 'expressionNum' : newexpressionnumber + }, + + success: function(data){ + $("div[name='ExpressionEditor']").empty(); + $("div[name='ExpressionEditor']").html(data); } - } - });*/ + }); + }); }); diff --git a/student/MyCourses/ViewCourse/WorksheetEditor/index.php b/student/MyCourses/ViewCourse/WorksheetEditor/index.php index 357bf7d..2792894 100644 --- a/student/MyCourses/ViewCourse/WorksheetEditor/index.php +++ b/student/MyCourses/ViewCourse/WorksheetEditor/index.php @@ -37,38 +37,11 @@ - -