Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lesson plans #2

Merged
merged 2 commits into from
Jun 10, 2018
Merged

Lesson plans #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
330cbf4
Lesson plan OpenSeed upload work
Jun 10, 2018
a0b502e
Lesson plan OpenSeed sync setup
Jun 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion Desktop/CourseDashBoard.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import "./plugins"

import "./course.js" as Scripts

import "./network.js" as Network

Item {
id:thisWindow

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -288,6 +295,9 @@ property string courseName: "Course Name"
height:parent.height
width:parent.width
state: "inActive"
onStateChanged: {
Scripts.loadUnits(userid,coursenumber)
}

}

Expand Down
20 changes: 13 additions & 7 deletions Desktop/EducatorUI.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"}
Expand Down Expand Up @@ -404,6 +409,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height:parent.height
state:"inActive"
onStateChanged: if(state == "inActive") {Courses.loadCourses(userid)}
}

CourseWizard {
Expand Down
5 changes: 0 additions & 5 deletions Desktop/Infoblock.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ Item {
Column {
width:parent.width

Text {
text:"Server Info:"

}

Text {
text:"Status: "+heart
}
Expand Down
10 changes: 9 additions & 1 deletion Desktop/LessonPlanEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -470,7 +478,7 @@ ESborder {
Text {
anchors.left: parent.left
anchors.margins: 10
text: qsTr("Student Product:")
text: qsTr("Student Activity:")
}

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion Desktop/LessonPlanWizard.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ ESborder {

Text {
anchors.horizontalCenter: parent.horizontalCenter
text: qsTr("Student Product")
text: qsTr("Student Activity")
font.pointSize: 20
}
Rectangle {
Expand Down
3 changes: 3 additions & 0 deletions Desktop/Login.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import "./theme"

import "./OSAuth.js" as Auth
import "./schoolwizard.js" as Scripts
import "./network.js" as Network

ESborder {
id:thisWindow
Expand Down Expand Up @@ -119,6 +120,8 @@ ESborder {
educatorHome.state = "Active"
} else {
schoolSetup.state = "Active"


}
} else {
schoolSetup.state = "Active"
Expand Down
6 changes: 3 additions & 3 deletions Desktop/OSAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}

Expand Down Expand Up @@ -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 {
Expand Down