feat: Add custom form for speakers and sessions

app/schemas/org.fossasia.openevent.general.OpenEventDatabase/8.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 8,
-    "identityHash": "c65ffea75fee1faf6cd199cbbc5c25ee",
+    "identityHash": "35acee6b8147d48c581bb8f884508c79",
     "entities": [
       {
         "tableName": "Event",
@@ -1223,7 +1223,7 @@
       },
       {
         "tableName": "Speaker",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT, `email` TEXT, `photoUrl` TEXT, `shortBiography` TEXT, `longBiography` TEXT, `speakingExperience` TEXT, `position` TEXT, `mobile` TEXT, `location` TEXT, `country` TEXT, `city` TEXT, `organisation` TEXT, `gender` TEXT, `website` TEXT, `twitter` TEXT, `facebook` TEXT, `linkedin` TEXT, `github` TEXT, `isFeatured` INTEGER NOT NULL, `event` INTEGER, `user` INTEGER, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT, `email` TEXT, `photoUrl` TEXT, `shortBiography` TEXT, `longBiography` TEXT, `speakingExperience` TEXT, `position` TEXT, `mobile` TEXT, `location` TEXT, `country` TEXT, `city` TEXT, `organisation` TEXT, `gender` TEXT, `website` TEXT, `twitter` TEXT, `facebook` TEXT, `linkedin` TEXT, `github` TEXT, `heardFrom` TEXT, `isFeatured` INTEGER NOT NULL, `event` INTEGER, `user` INTEGER, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -1339,6 +1339,12 @@
             "affinity": "TEXT",
             "notNull": false
           },
+          {
+            "fieldPath": "heardFrom",
+            "columnName": "heardFrom",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "isFeatured",
             "columnName": "isFeatured",
@@ -1985,7 +1991,7 @@
       },
       {
         "tableName": "Proposal",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER, `title` TEXT, `language` TEXT, `shortAbstract` TEXT, `comments` TEXT, `startsAt` TEXT, `endsAt` TEXT, `track` TEXT, `event` INTEGER, `speakers` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER, `title` TEXT, `language` TEXT, `shortAbstract` TEXT, `comments` TEXT, `startsAt` TEXT, `endsAt` TEXT, `subTitle` TEXT, `longAbstract` TEXT, `track` TEXT, `event` INTEGER, `speakers` TEXT NOT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -2029,6 +2035,18 @@
             "affinity": "TEXT",
             "notNull": false
           },
+          {
+            "fieldPath": "subTitle",
+            "columnName": "subTitle",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "longAbstract",
+            "columnName": "longAbstract",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "track",
             "columnName": "track",
@@ -2086,7 +2104,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c65ffea75fee1faf6cd199cbbc5c25ee')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '35acee6b8147d48c581bb8f884508c79')"
     ]
   }
 }

app/src/main/java/org/fossasia/openevent/general/sessions/SessionApi.kt

@@ -1,6 +1,7 @@
 package org.fossasia.openevent.general.sessions
 
 import io.reactivex.Single
+import org.fossasia.openevent.general.attendees.forms.CustomForm
 import org.fossasia.openevent.general.speakercall.Proposal
 import retrofit2.http.GET
 import retrofit2.http.Path
@@ -32,4 +33,10 @@ interface SessionApi {
 
     @GET("sessions/{sessionId}?include=track,session-type,event,creator,speakers")
     fun getSessionById(@Path("sessionId") sessionId: Long): Single<Session>
+
+    @GET("events/{id}/custom-forms")
+    fun getCustomForms(
+        @Path("id") eventId: Long,
+        @Query("filter") filter: String
+    ): Single<List<CustomForm>>
 }

app/src/main/java/org/fossasia/openevent/general/sessions/SessionService.kt

@@ -1,6 +1,7 @@
 package org.fossasia.openevent.general.sessions
 
 import io.reactivex.Single
+import org.fossasia.openevent.general.attendees.forms.CustomForm
 import org.fossasia.openevent.general.speakercall.Proposal
 
 class SessionService(
@@ -30,4 +31,19 @@ class SessionService(
 
     fun getSessionsUnderSpeakerAndEvent(speakerId: Long, query: String): Single<List<Session>> =
         sessionApi.getSessionsUnderSpeaker(speakerId, filter = query)
+
+    fun getCustomFormsForSessions(id: Long): Single<List<CustomForm>> {
+        val filter = """[{
+                |   'and':[{
+                |       'name':'form',
+                |       'op':'eq',
+                |       'val':'session'
+                |    },{
+                |       'name':'is-included',
+                |       'op':'eq',
+                |       'val':true
+                |    }]
+                |}]""".trimMargin().replace("'", "\"")
+        return sessionApi.getCustomForms(id, filter)
+    }
 }

app/src/main/java/org/fossasia/openevent/general/speakercall/EditSpeakerFragment.kt

@@ -20,6 +20,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.navigation.Navigation.findNavController
 import androidx.navigation.fragment.navArgs
+import com.google.android.material.textfield.TextInputLayout
 import com.squareup.picasso.MemoryPolicy
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.dialog_edit_profile_image.view.editImage
@@ -37,13 +38,35 @@ import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerTwit
 import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.submitButton
 import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerEmailLayout
 import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerNameLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerOrgLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerPositionLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerShortBioLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerWebsiteLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerTwitterLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerLongBio
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerLongBioLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerFacebook
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerGithub
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerGithubLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerLinkedIn
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerLinkedInLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerMobile
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerMobileLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerCountry
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerCountryLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerHeardFrom
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerHeardFromLayout
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerSpeakingExp
+import kotlinx.android.synthetic.main.fragment_proposal_speaker.view.speakerSpeakingExpLayout
 import org.fossasia.openevent.general.CircleTransform
 import org.fossasia.openevent.general.ComplexBackPressFragment
 import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.RotateBitmap
+import org.fossasia.openevent.general.attendees.forms.CustomForm
 import org.fossasia.openevent.general.auth.User
 import org.fossasia.openevent.general.auth.UserId
 import org.fossasia.openevent.general.event.EventId
+import org.fossasia.openevent.general.speakercall.form.SpeakerIdentifier
 import org.fossasia.openevent.general.speakers.Speaker
 import org.fossasia.openevent.general.utils.Utils.progressDialog
 import org.fossasia.openevent.general.utils.Utils.show
@@ -140,6 +163,8 @@ class EditSpeakerFragment : Fragment(), ComplexBackPressFragment {
                     findNavController(rootView).popBackStack()
             })
 
+        setupCustomForms()
+
         rootView.speakerNameLayout.setRequired()
         rootView.speakerEmailLayout.setRequired()
         rootView.submitButton.text = getString(if (isCreatingNewSpeaker)
@@ -175,6 +200,14 @@ class EditSpeakerFragment : Fragment(), ComplexBackPressFragment {
                 organisation = rootView.speakerOrganization.text.toString(),
                 position = rootView.speakerPosition.text.toString(),
                 shortBiography = rootView.speakerShortBio.text.toString(),
+                longBiography = rootView.speakerLongBio.text.toString(),
+                country = rootView.speakerCountry.text.toString(),
+                mobile = rootView.speakerMobile.text.toString(),
+                speakingExperience = rootView.speakerSpeakingExp.text.toString(),
+                heardFrom = rootView.speakerHeardFrom.text.toString(),
+                facebook = rootView.speakerFacebook.text.toString().emptyToNull(),
+                github = rootView.speakerGithub.text.toString().emptyToNull(),
+                linkedin = rootView.speakerLinkedIn.text.toString().emptyToNull(),
                 website = rootView.speakerWebsite.text.toString().emptyToNull(),
                 twitter = rootView.speakerTwitter.text.toString().emptyToNull(),
                 event = EventId(safeArgs.eventId),
@@ -368,5 +401,54 @@ class EditSpeakerFragment : Fragment(), ComplexBackPressFragment {
         rootView.speakerShortBio.setText(speaker.shortBiography)
         rootView.speakerWebsite.setText(speaker.website)
         rootView.speakerTwitter.setText(speaker.twitter)
+        rootView.speakerHeardFrom.setText(speaker.heardFrom)
+        rootView.speakerSpeakingExp.setText(speaker.speakingExperience)
+    }
+
+    private fun setupCustomForms() {
+        editSpeakerViewModel.forms
+            .nonNull()
+            .observe(viewLifecycleOwner, Observer {
+                it.forEach { form ->
+                    setupFormWithSpeakerFields(form)
+                }
+            })
+
+        val currentForms = editSpeakerViewModel.forms.value
+        if (currentForms != null)
+            currentForms.forEach {
+                setupFormWithSpeakerFields(it)
+            }
+        else
+            editSpeakerViewModel.getFormsForSpeaker(safeArgs.eventId)
+    }
+
+    private fun setupFormWithSpeakerFields(form: CustomForm) {
+        when (form.fieldIdentifier) {
+            SpeakerIdentifier.NAME -> setupField(rootView.speakerNameLayout, form.isRequired)
+            SpeakerIdentifier.EMAIL -> setupField(rootView.speakerEmailLayout, form.isRequired)
+            SpeakerIdentifier.PHOTO -> rootView.speakerImage.isVisible = true
+            SpeakerIdentifier.ORGANIZATION -> setupField(rootView.speakerOrgLayout, form.isRequired)
+            SpeakerIdentifier.POSITION -> setupField(rootView.speakerPositionLayout, form.isRequired)
+            SpeakerIdentifier.SHORT_BIO -> setupField(rootView.speakerShortBioLayout, form.isRequired)
+            SpeakerIdentifier.LONG_BIO -> setupField(rootView.speakerLongBioLayout, form.isRequired)
+            SpeakerIdentifier.COUNTRY -> setupField(rootView.speakerCountryLayout, form.isRequired)
+            SpeakerIdentifier.MOBILE -> setupField(rootView.speakerMobileLayout, form.isRequired)
+            SpeakerIdentifier.WEBSITE -> setupField(rootView.speakerWebsiteLayout, form.isRequired)
+            SpeakerIdentifier.FACEBOOK -> setupField(rootView.speakerWebsiteLayout, form.isRequired)
+            SpeakerIdentifier.GITHUB -> setupField(rootView.speakerGithubLayout, form.isRequired)
+            SpeakerIdentifier.TWITTER -> setupField(rootView.speakerTwitterLayout, form.isRequired)
+            SpeakerIdentifier.LINKEDIN -> setupField(rootView.speakerLinkedInLayout, form.isRequired)
+            SpeakerIdentifier.HEARD_FROM -> setupField(rootView.speakerHeardFromLayout, form.isRequired)
+            SpeakerIdentifier.SPEAKING_EXPERIENCE -> setupField(rootView.speakerSpeakingExpLayout, form.isRequired)
+            else -> return
+        }
+    }
+
+    private fun setupField(layout: TextInputLayout, isRequired: Boolean) {
+        layout.isVisible = true
+        if (isRequired) {
+            layout.setRequired()
+        }
     }
 }

app/src/main/java/org/fossasia/openevent/general/speakercall/EditSpeakerViewModel.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.fossasia.openevent.general.R
+import org.fossasia.openevent.general.attendees.forms.CustomForm
 import org.fossasia.openevent.general.auth.AuthHolder
 import org.fossasia.openevent.general.auth.AuthService
 import org.fossasia.openevent.general.auth.UploadImage
@@ -38,6 +39,8 @@ class EditSpeakerViewModel(
     private val mutableSubmitSuccess = MutableLiveData<Boolean>()
     val submitSuccess: LiveData<Boolean> = mutableSubmitSuccess
     private var updatedImageTemp = MutableLiveData<File>()
+    private val mutableForms = MutableLiveData<List<CustomForm>>()
+    val forms: LiveData<List<CustomForm>> = mutableForms
 
     var encodedImage: String? = null
 
@@ -57,6 +60,20 @@ class EditSpeakerViewModel(
         })
     }
 
+    fun getFormsForSpeaker(eventId: Long) {
+        compositeDisposable += speakerService.getCustomFormsForSpeakers(eventId)
+            .withDefaultSchedulers()
+            .doOnSubscribe {
+                mutableProgress.value = true
+            }.doFinally {
+                mutableProgress.value = false
+            }.subscribe({
+                mutableForms.value = it
+            }, {
+                Timber.e(it, "Fail on fetching custom forms for event $eventId")
+            })
+    }
+
     fun loadSpeaker(speakerId: Long) {
         if (speakerId == -1L) {
             mutableMessage.value = resource.getString(R.string.no_speaker_info)

app/src/main/java/org/fossasia/openevent/general/speakercall/Proposal.kt

@@ -25,6 +25,8 @@ data class Proposal(
     val comments: String? = null,
     val startsAt: String? = null,
     val endsAt: String? = null,
+    val subTitle: String? = null,
+    val longAbstract: String? = null,
     @ColumnInfo(index = true)
     @Relationship("track", resolve = true)
     val track: Track? = null,