Merge pull request #2 from bflanagin/lessonPlans

Lesson plans
bflanagin · Jun 10, 2018 · 4f8cb82 · 4f8cb82
2 parents c95185b + a0b502e
commit 4f8cb82
Show file tree

Hide file tree

Showing 11 changed files with 770 additions and 399 deletions.
diff --git a/Desktop/CourseDashBoard.qml b/Desktop/CourseDashBoard.qml
@@ -6,6 +6,8 @@ import "./plugins"
 
 import "./course.js" as Scripts
 
+import "./network.js" as Network
+
 Item {
 id:thisWindow
 
@@ -154,7 +156,9 @@ property string courseName: "Course Name"
                             width:thisWindow.width * 0.98
                             height:if(lessons.height > unitColumn.height) {lessons.height * 1.05} else {unitColumn.height* 1.05}
 
-
+                            Component.onCompleted: {
+                               Network.checkOpenSeed(userid,cdate,"Units")
+                            }
                             Row {
                                 anchors.horizontalCenter: parent.horizontalCenter
                                 width:parent.width * 0.98
@@ -207,6 +211,9 @@ property string courseName: "Course Name"
                                                 width:thisWindow.width * 0.58
                                                 height:lessonColumn.height * 1.1
 
+                                                Component.onCompleted: {
+                                                   Network.checkOpenSeed(userid,cdate,"Lessons")
+                                                }
 
                                             Column {
                                                 id:lessonColumn
@@ -288,6 +295,9 @@ property string courseName: "Course Name"
         height:parent.height
         width:parent.width
         state: "inActive"
+        onStateChanged: {
+                Scripts.loadUnits(userid,coursenumber)
+        }
 
     }
 

diff --git a/Desktop/EducatorUI.qml b/Desktop/EducatorUI.qml
@@ -65,7 +65,12 @@ Item {
 
 
     onStateChanged: if(state == "Active") {Courses.loadCourses(userid)
-                                            Network.checkOpenSeed(userid,schoolCode,"School")}
+
+                                            Network.checkOpenSeed(userid,schoolCode,"School")
+                                            Network.checkOpenSeed(userid,userid,"Educator")
+                                            }
+
+
 
     Rectangle {
         anchors.fill: parent
@@ -110,12 +115,7 @@ Item {
                 text: schoolName.replace(/_/g, " ").trim()
                 wrapMode: Text.WordWrap
 
-                Text {
-                    anchors.bottom:parent.bottom
-                    anchors.right:parent.right
-                    text:schoolCode
-                    font.pointSize: 6
-                }
+
 
                 MouseArea {
                     anchors.fill: parent
@@ -199,6 +199,11 @@ Item {
                             width:parent.width
                             height:leftMenu.width * 0.3
 
+                            Component.onCompleted: {
+                               Network.checkOpenSeed(userid,cdate,"Courses")
+
+                            }
+
                             Rectangle {
                                 anchors.fill: parent
                                 color:if(index % 2) {"#FFFFFF"} else {"#FAFAFA"}
@@ -404,6 +409,7 @@ Item {
         anchors.verticalCenter: parent.verticalCenter
         height:parent.height
         state:"inActive"
+        onStateChanged: if(state == "inActive") {Courses.loadCourses(userid)}
     }
 
     CourseWizard {

diff --git a/Desktop/Infoblock.qml b/Desktop/Infoblock.qml
@@ -5,11 +5,6 @@ Item {
     Column {
         width:parent.width
 
-    Text {
-        text:"Server Info:"
-
-    }
-
     Text {
         text:"Status: "+heart
     }

diff --git a/Desktop/LessonPlanEditor.qml b/Desktop/LessonPlanEditor.qml
@@ -76,6 +76,14 @@ ESborder {
         }
     }
 
+    Button {
+        anchors.top: parent.top
+        anchors.right:parent.right
+        anchors.margins: 20
+        text:qsTr("Student View")
+        background: ESTextField{}
+    }
+
     Rectangle {
         anchors.top: title.bottom
         anchors.topMargin: 20
@@ -470,7 +478,7 @@ ESborder {
                     Text {
                         anchors.left: parent.left
                         anchors.margins: 10
-                        text: qsTr("Student Product:")
+                        text: qsTr("Student Activity:")
                     }
 
                     Rectangle {

diff --git a/Desktop/LessonPlanWizard.qml b/Desktop/LessonPlanWizard.qml
@@ -568,7 +568,7 @@ ESborder {
 
                 Text {
                     anchors.horizontalCenter: parent.horizontalCenter
-                    text: qsTr("Student Product")
+                    text: qsTr("Student Activity")
                     font.pointSize: 20
                 }
                 Rectangle {

diff --git a/Desktop/Login.qml b/Desktop/Login.qml
@@ -7,6 +7,7 @@ import "./theme"
 
 import "./OSAuth.js" as Auth
 import "./schoolwizard.js" as Scripts
+import "./network.js" as Network
 
 ESborder {
     id:thisWindow
@@ -119,6 +120,8 @@ ESborder {
                                     educatorHome.state = "Active"
                                     } else {
                                         schoolSetup.state = "Active"
+
+
                                     }
                         } else {
                             schoolSetup.state = "Active"

diff --git a/Desktop/OSAuth.js b/Desktop/OSAuth.js
@@ -98,12 +98,12 @@ function checkcreds(field,info) {
             } else {
 
                 if(field === "email") {
-                   console.log (http.responseText);
+                  // console.log (http.responseText);
                     uniqueemail = http.responseText;
                 }
                 if(field === "username") {
                     uniquename = http.responseText;
-                    console.log (http.responseText);
+                  //  console.log (http.responseText);
 
                 }
 
@@ -154,7 +154,7 @@ function account_type(userid) {
 
                 console.log("Incorrect AppID");
             } else {
-               console.log(http.responseText);
+              // console.log(http.responseText);
                 if(http.responseText === "1") {
                     connection_type = "Admin";
                 } else {