make registration work

jayneeel · Apr 11, 2023 · 38d7b0c · 38d7b0c
1 parent dd24c23
commit 38d7b0c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 14 deletions.
diff --git a/application/app/src/main/java/com/example/csi_dmce/auth/RegistrationActivity.kt b/application/app/src/main/java/com/example/csi_dmce/auth/RegistrationActivity.kt
@@ -35,9 +35,6 @@ class RegistrationActivity: AppCompatActivity() {
         etEmail = findViewById(R.id.edit_text_register_email)
         etPassword = findViewById(R.id.edit_text_register_password)
         etStudentId = findViewById(R.id.edit_text_register_student_id)
-        etEmail.setText("[email protected]")
-        etStudentId.setText("2018FHCO106")
-        etPassword.setText("root")
 
         btnRegister = findViewById(R.id.button_register)
         btnRegister.setOnClickListener {

diff --git a/application/app/src/main/java/com/example/csi_dmce/complaint/ComplaintAdapter.kt b/application/app/src/main/java/com/example/csi_dmce/complaint/ComplaintAdapter.kt
@@ -21,7 +21,6 @@ class ComplaintAdapter(private val complaintList : ArrayList<Complaint>): Recycl
         val desc : TextView = itemView.findViewById(R.id.complaint_text)
         val subject : TextView = itemView.findViewById(R.id.complaint_sub)
         val replyBtn : Button = itemView.findViewById(R.id.reply_btn)
-        val btnDecline : Button = itemView.findViewById(R.id.dialog_decline_btn)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {

diff --git a/application/app/src/main/java/com/example/csi_dmce/database/EventWrapper.kt b/application/app/src/main/java/com/example/csi_dmce/database/EventWrapper.kt
@@ -163,12 +163,26 @@ class EventWrapper {
                 File.createTempFile("poster", posterExtension)
             }
 
-            Log.d("UPDATE_FLOW_OLDEVENTREF", oldEventRef.toString())
-            Log.d("UPDATE_FLOW_NEWEVENTREF", newEventRef.toString())
-            Log.d("UPDATE_FLOW_TEMPFILE", localFile.absolutePath.toString())
-
             oldEventRef.getFile(localFile).await()
             newEventRef.putFile(Uri.fromFile(localFile)).await()
         }
+
+        suspend fun registerStudent(eventObject: Event, studentId: String) {
+            if (eventObject.registrants == null) {
+                eventObject.registrants = mutableListOf(studentId)
+            } else {
+                eventObject.registrants!!.add(studentId)
+            }
+
+            Log.d("EVENT", eventObject.toString())
+
+            updateEvent(eventObject, eventObject)
+        }
+
+        suspend fun unregisterStudent(eventObject: Event, studentId: String) {
+            eventObject.registrants?.remove(studentId)
+            Log.d("EVENT", eventObject.toString())
+            updateEvent(eventObject, eventObject)
+        }
     }
 }
diff --git a/application/app/src/main/java/com/example/csi_dmce/events/EventUpsertActivity.kt b/application/app/src/main/java/com/example/csi_dmce/events/EventUpsertActivity.kt
@@ -170,6 +170,7 @@ class EventUpsertActivity: AppCompatActivity() {
             title = etEventTitle.text.toString(),
             venue = etEventVenue.text.toString(),
             speaker = etEventSpeaker.text.toString(),
+            prerequisites = etEventPrerequisites.text.toString(),
             uuid = Helpers.generateEventUuid(),
             datetime = Helpers.generateUnixTimestampFromDate(
                 Helpers.eventUpsertDateTimeFormat.parse(etEventDateTime.text.toString())!!

diff --git a/application/app/src/main/java/com/example/csi_dmce/events/EventViewActivity.kt b/application/app/src/main/java/com/example/csi_dmce/events/EventViewActivity.kt
@@ -211,11 +211,10 @@ class EventViewActivity: AppCompatActivity() {
                         stateRegistered = false
                     }
 
-
                     if (!stateRegistered) {
-                        // TODO: Insert attendee into the database
+                        runBlocking { EventWrapper.unregisterStudent(eventObject, CsiAuthWrapper.getStudentId(applicationContext)) }
                     } else {
-                        // TODO: Remove attendee from the database.
+                        runBlocking { EventWrapper.registerStudent(eventObject, CsiAuthWrapper.getStudentId(applicationContext)) }
                     }
 
 

diff --git a/application/app/src/main/res/layout/complaint_reply_dialog.xml b/application/app/src/main/res/layout/complaint_reply_dialog.xml
@@ -93,7 +93,7 @@
                 android:layout_marginHorizontal="20dp">
 
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/dialog_decline_btn"
+                android:id="@+id/button_dialog_decline_complaints"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"

diff --git a/application/app/src/main/res/layout/expense_approval_card.xml b/application/app/src/main/res/layout/expense_approval_card.xml
@@ -80,7 +80,7 @@
 
 
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/dialog_decline_btn"
+            android:id="@+id/button_dialog_decline_complaints"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"

diff --git a/application/app/src/main/res/layout/expense_expanded_card.xml b/application/app/src/main/res/layout/expense_expanded_card.xml
@@ -248,7 +248,7 @@
 
 
                 <com.google.android.material.button.MaterialButton
-                    android:id="@+id/dialog_decline_btn"
+                    android:id="@+id/button_dialog_decline_complaints"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"