Skip to content

Commit 6bab21c

Browse files
RickyYWangRickyYWang
committed
drastic changes
1 parent 62bd227 commit 6bab21c

File tree

7 files changed

+81
-19
lines changed

7 files changed

+81
-19
lines changed

‎Class.swift

+1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ struct Class {
1212
let classTitle : String
1313
let teacher : String
1414
let id : String
15+
let teacherID: String
1516
}

‎ClassroomConnections.xcworkspace/xcuserdata/Ricky.xcuserdatad/UserInterfaceState.xcuserstate

4.18 KB
Binary file not shown.

‎ClassroomConnections/Base.lproj/Main.storyboard

+2-2
Original file line numberDiff line numberDiff line change
@@ -974,8 +974,8 @@
974974
<image name="paperplane.fill" catalog="system" width="64" height="60"/>
975975
</resources>
976976
<inferredMetricsTieBreakers>
977-
<segue reference="f5H-xm-6mY"/>
977+
<segue reference="TKo-aY-hQL"/>
978978
<segue reference="OYR-f7-Q6Y"/>
979-
<segue reference="GjU-0t-bGD"/>
979+
<segue reference="62K-NU-Mqj"/>
980980
</inferredMetricsTieBreakers>
981981
</document>

‎ClassroomConnections/ViewControllers/StudentClassChatViewController.swift

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class StudentClassChatViewController: UIViewController {
1717
@IBOutlet weak var messageTextField: UITextField!
1818
@IBOutlet weak var tableView: UITableView!
1919
var classRoomCode: String = "stuff"
20+
var teacherID : String = "teacherId"
2021
@IBOutlet weak var qSwitch: UISwitch!
2122

2223
var messages: [Message] = [Message]()

‎ClassroomConnections/ViewControllers/StudentClasses.swift

+7-5
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@ class StudentClasses: UIViewController {
7272
let title = value["Title"] as! String
7373
let iden = value["ID"] as! String
7474
let teacherName = value["Teacher"] as! String
75+
let eacherID = value["TeacherID"] as! String
7576

7677
print(title)
77-
self.classes.append(Class(classTitle: title , teacher: teacherName, id: iden))
78+
self.classes.append(Class(classTitle: title , teacher: teacherName, id: iden, teacherID: eacherID))
7879
self.tableView.reloadData()
7980
// self.performSegue(withIdentifier: "studentToTabBar", sender: self)
8081
}
@@ -115,10 +116,11 @@ class StudentClasses: UIViewController {
115116
let title = value["Title"] as! String
116117
let iden = value["ID"] as! String
117118
let teacherName = value["Teacher"] as! String
119+
let eacherID = value["TeacherID"] as! String
118120
print(title)
119121

120122

121-
self.classes.append(Class(classTitle: title , teacher: teacherName, id: iden))
123+
self.classes.append(Class(classTitle: title , teacher: teacherName, id: iden, teacherID: eacherID))
122124
self.tableView.reloadData()
123125
// self.performSegue(withIdentifier: "studentToTabBar", sender: self)
124126
}
@@ -214,11 +216,11 @@ extension StudentClasses: UITableViewDelegate {
214216
}
215217
let titleValue = value["Title"] as! String
216218
let teacher = value["Teacher"] as! String
217-
219+
let teacherID = value["TeacherID"] as! String
218220
self.topic = titleValue
219221

220222

221-
self.ref.child("UserInfo").child(Auth.auth().currentUser!.uid).child("Classrooms").child(self.textField.text!).updateChildValues(["ID" : self.textField.text!, "Title" : titleValue, "Teacher" : teacher])
223+
self.ref.child("UserInfo").child(Auth.auth().currentUser!.uid).child("Classrooms").child(self.textField.text!).updateChildValues(["ID" : self.textField.text!, "Title" : titleValue, "Teacher" : teacher, "TeacherID" : teacherID])
222224

223225
}) { (error) in
224226
print("error:\(error.localizedDescription)")
@@ -278,7 +280,7 @@ extension StudentClasses: UITableViewDelegate {
278280

279281

280282
print(identification)
281-
ref.child("UserInfo").child(Auth.auth().currentUser!.uid).child("current").updateChildValues(["ID" : identification, "Title" : classes[indexPath.row].classTitle ])
283+
ref.child("UserInfo").child(Auth.auth().currentUser!.uid).child("current").updateChildValues(["ID" : identification, "Title" : classes[indexPath.row].classTitle, "TeacherID": classes[indexPath.row].teacherID ])
282284

283285
performSegue(withIdentifier: "studentToTabBar", sender: self)
284286

‎ClassroomConnections/ViewControllers/TeacherClasses.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class TeacherClasses: UIViewController {
6060
}
6161
let iden = value["id"] as! String
6262

63+
6364
self.ref.child("UserInfo").child(iden).child("Classrooms").child(removeID).removeValue()
6465
self.getInfo()
6566
}
@@ -109,7 +110,7 @@ class TeacherClasses: UIViewController {
109110
let title = value["Title"] as! String
110111
let inden = value["ID"] as! String
111112
print("\(lastName) hi hi")
112-
self.classes.append(Class(classTitle: title , teacher: lastName, id:inden))
113+
self.classes.append(Class(classTitle: title , teacher: lastName, id:inden , teacherID: Auth.auth().currentUser!.uid))
113114
self.tableView.reloadData()
114115
}
115116

@@ -139,7 +140,7 @@ class TeacherClasses: UIViewController {
139140
let title = value["Title"] as! String
140141
let iden = value["ID"] as! String
141142
print("\(self.name) hi hi")
142-
self.classes.append(Class(classTitle: title , teacher: self.name, id:iden))
143+
self.classes.append(Class(classTitle: title , teacher: self.name, id:iden, teacherID: Auth.auth().currentUser!.uid))
143144
self.tableView.reloadData()
144145
}
145146

@@ -212,9 +213,9 @@ extension TeacherClasses: UITableViewDelegate {
212213
// self.classes.append(Class(classTitle: "APCSA", teacher: "Fulk"))
213214
// self.tableView.reloadData()
214215

215-
self.ref.child("UserInfo").child(Auth.auth().currentUser!.uid).child("Classrooms").child( self.textField.text!).updateChildValues(["Title" : self.topicTextField.text!, "Teacher" : self.name, "ID" : self.textField.text!])
216+
self.ref.child("UserInfo").child(Auth.auth().currentUser!.uid).child("Classrooms").child( self.textField.text!).updateChildValues(["Title" : self.topicTextField.text!, "Teacher" : self.name, "TeacherID": Auth.auth().currentUser!.uid, "ID" : self.textField.text!])
216217

217-
self.ref.child("Classrooms").child(self.textField.text!).updateChildValues(["Teacher" : self.name, "Title" : self.topicTextField.text!, "ID" : self.textField.text!])
218+
self.ref.child("Classrooms").child(self.textField.text!).updateChildValues(["Teacher" : self.name, "Title" : self.topicTextField.text!, "TeacherID": Auth.auth().currentUser!.uid, "ID" : self.textField.text!])
218219

219220
self.ref.child("Classrooms").child(self.textField.text!).child("Calendar").updateChildValues([ "monday" : 0, "tuesday" : 0, "wednesday" : 0, "thursday" : 0, "friday" : 0])
220221
//update

‎ClassroomConnections/ViewControllers/TeachersClassChatViewController.swift

+65-8
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,14 @@ extension TeacherClassChatViewController: UITableViewDataSource {
204204
cell.label.text = messages[indexPath.row].body
205205
cell.senderName.text = "Sender: " + messages[indexPath.row].sender
206206

207-
//
208-
if cell.senderName.text == "Sender: " + Auth.auth().currentUser!.uid {
209-
cell.messageBubble.backgroundColor = UIColor(red: 235.0/255.0, green: 103.0/255.0, blue: 52.0/255.0, alpha: 0.3)
207+
if (messages[indexPath.row].senderID == Auth.auth().currentUser!.uid) {
208+
cell.messageBubble.backgroundColor = UIColor(red: 255.0/255.0, green: 102.0/255.0, blue: 102.0/255.0, alpha: 1)
210209
cell.rightImage?.tintColor = UIColor.systemRed
211-
}
210+
} else {
211+
cell.messageBubble.backgroundColor = UIColor(red: 100.0*0.6/255.0, green: 96.0*0.6/255.0, blue: 255.0*0.6/255.0, alpha: 0.3)
212+
cell.rightImage?.tintColor = UIColor.systemIndigo
213+
}
214+
212215

213216
//cell.rightImage?.tintColor = UIColor.systemTeal
214217

@@ -237,9 +240,8 @@ extension TeacherClassChatViewController: UITableViewDataSource {
237240
// cell.senderName.isHidden = true
238241
cell.label.text = messages[indexPath.row].body
239242
cell.senderName.text = "Sender: " + messages[indexPath.row].sender
240-
cell.messageBubble.backgroundColor = UIColor(red: 235.0/255.0, green: 103.0/255.0, blue: 52.0/255.0, alpha: 0.3)
241-
cell.rightImage?.tintColor = UIColor.systemRed
242-
243+
cell.messageBubble.backgroundColor = UIColor(red: 100.0*0.6/255.0, green: 96.0*0.6/255.0, blue: 255.0*0.6/255.0, alpha: 0.3)
244+
cell.rightImage?.tintColor = UIColor.systemIndigo
243245
if messages[indexPath.row].messageType == "Question" {
244246
cell.rightImage.image = UIImage(systemName: "questionmark.square")
245247
} else if messages[indexPath.row].messageType == "Normal" {
@@ -260,7 +262,62 @@ extension TeacherClassChatViewController: UITableViewDelegate {
260262
// still need to do this
261263
// still need to do this
262264
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
263-
print("person selected row : " + String(indexPath.row) + " (starts from 0)")
265+
let selected = indexPath.row
266+
267+
let message = messages[selected]
268+
269+
if (message.messageType == "Question") {
270+
let alert = UIAlertController(title: "Respond to Question", message: message.body, preferredStyle: .actionSheet)
271+
let cancel = UIAlertAction(title: "Cancel", style: .default) { (action) in
272+
273+
}
274+
let upvote = UIAlertAction(title: "Upvote", style: .default) { (action) in
275+
self.ref.child("Classrooms").child(self.classRoomCode).child("Messages").observeSingleEvent(of: .value, with: { (snapshot) in
276+
277+
guard let value = snapshot.value as? NSDictionary else {
278+
print("No Data!!!")
279+
return
280+
}
281+
282+
283+
let identity = value["ID"] as! String
284+
285+
self.classRoomCode = identity
286+
287+
288+
// self.ref.child("Classrooms").child(identity).child("Messages").child("Message1").setValue(messageDictionary) {
289+
// (error, reference) in
290+
//
291+
// if error != nil {
292+
// print(error!)
293+
// } else {
294+
// print("Message saved succesfully")
295+
// }
296+
// }
297+
self.retrieveMessages()
298+
299+
}) { (error) in
300+
print("error:\(error.localizedDescription)")
301+
}
302+
303+
}
304+
let answer = UIAlertAction(title: "Answer", style: .default) { (action) in
305+
// if (self.questionOn) {
306+
// self.questionSwitch(nil)
307+
// }
308+
self.answerOn = true
309+
self.answerLabel.isHidden = false
310+
self.answerIndex = indexPath.row+1
311+
}
312+
313+
314+
alert.addAction(answer)
315+
alert.addAction(upvote)
316+
alert.addAction(cancel)
317+
present(alert, animated: true)
318+
319+
}
320+
264321
}
265322

266323
// func tableView(_ tableView: UITableView, leadingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {

0 commit comments

Comments
 (0)