From 38d7b0c18b2b9d55e1ad9f4c9df806792dee7f21 Mon Sep 17 00:00:00 2001 From: Bourbon Date: Wed, 12 Apr 2023 00:58:02 +0530 Subject: [PATCH] make registration work --- .../csi_dmce/auth/RegistrationActivity.kt | 3 --- .../csi_dmce/complaint/ComplaintAdapter.kt | 1 - .../example/csi_dmce/database/EventWrapper.kt | 22 +++++++++++++++---- .../csi_dmce/events/EventUpsertActivity.kt | 1 + .../csi_dmce/events/EventViewActivity.kt | 5 ++--- .../res/layout/complaint_reply_dialog.xml | 2 +- .../main/res/layout/expense_approval_card.xml | 2 +- .../main/res/layout/expense_expanded_card.xml | 2 +- 8 files changed, 24 insertions(+), 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 index 1315614..a6403a4 100644 --- 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("amitkulkarni2028@gmail.com") - 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 index 40a8998..dd9b941 100644 --- 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): 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 index 8c514a3..9e6f654 100644 --- 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) + } } } \ No newline at end of file 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 index 4986fa0..3e272ec 100644 --- 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 index 70d8926..35b0066 100644 --- 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 index 59d1e21..1640aee 100644 --- 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">