Skip to content

feat: Add create/load speaker profile for user #1816

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

Merged
merged 2 commits into from
Jun 1, 2019
Merged

feat: Add create/load speaker profile for user #1816

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
9c004ff
Summary: Set up create/load speaker profile
anhanh11001 Jun 1, 2019
c741037
Merge branch 'development' into 1811_send_proposal
liveHarshit Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions app/schemas/org.fossasia.openevent.general.OpenEventDatabase/6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"formatVersion": 1,
"database": {
"version": 6,
"identityHash": "c29e46595502e4aa3dfd4c5c66474e4a",
"identityHash": "e888653aeabddbde1210a0b6e549e7aa",
"entities": [
{
"tableName": "Event",
Expand Down Expand Up @@ -1113,7 +1113,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, 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, `isFeatured` INTEGER NOT NULL, `event` INTEGER, `user` INTEGER, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
Expand Down Expand Up @@ -1234,6 +1234,18 @@
"columnName": "isFeatured",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "event",
"columnName": "event",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "user",
"columnName": "user",
"affinity": "INTEGER",
"notNull": false
}
],
"primaryKey": {
Expand All @@ -1242,7 +1254,24 @@
],
"autoGenerate": false
},
"indices": [],
"indices": [
{
"name": "index_Speaker_event",
"unique": false,
"columnNames": [
"event"
],
"createSql": "CREATE INDEX `index_Speaker_event` ON `${TABLE_NAME}` (`event`)"
},
{
"name": "index_Speaker_user",
"unique": false,
"columnNames": [
"user"
],
"createSql": "CREATE INDEX `index_Speaker_user` ON `${TABLE_NAME}` (`user`)"
}
],
"foreignKeys": []
},
{
Expand Down Expand Up @@ -1666,7 +1695,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, \"c29e46595502e4aa3dfd4c5c66474e4a\")"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e888653aeabddbde1210a0b6e549e7aa')"
]
}
}
3 changes: 2 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import org.fossasia.openevent.general.attendees.ListAttendeeIdConverter
import org.fossasia.openevent.general.attendees.forms.CustomForm
import org.fossasia.openevent.general.auth.User
import org.fossasia.openevent.general.auth.UserDao
import org.fossasia.openevent.general.auth.UserIdConverter
import org.fossasia.openevent.general.event.Event
import org.fossasia.openevent.general.event.EventDao
import org.fossasia.openevent.general.event.EventIdConverter
Expand Down Expand Up @@ -45,7 +46,7 @@ import org.fossasia.openevent.general.ticket.TicketIdConverter
EventTopic::class, Order::class, CustomForm::class, Speaker::class, SpeakerWithEvent::class, Sponsor::class,
SponsorWithEvent::class, Session::class, SpeakersCall::class], version = 6)
@TypeConverters(EventIdConverter::class, EventTopicConverter::class, EventTypeConverter::class,
EventSubTopicConverter::class, TicketIdConverter::class, MicroLocationConverter::class,
EventSubTopicConverter::class, TicketIdConverter::class, MicroLocationConverter::class, UserIdConverter::class,
AttendeeIdConverter::class, ListAttendeeIdConverter::class, SessionTypeConverter::class, TrackConverter::class)
abstract class OpenEventDatabase : RoomDatabase() {

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.fossasia.openevent.general.R
import org.fossasia.openevent.general.event.EVENT_DETAIL_FRAGMENT
import org.fossasia.openevent.general.notification.NOTIFICATION_FRAGMENT
import org.fossasia.openevent.general.order.ORDERS_FRAGMENT
import org.fossasia.openevent.general.speakercall.SPEAKERS_CALL_FRAGMENT
import org.fossasia.openevent.general.ticket.TICKETS_FRAGMENT
import org.fossasia.openevent.general.utils.Utils
import org.fossasia.openevent.general.utils.Utils.show
Expand Down Expand Up @@ -198,6 +199,7 @@ class LoginFragment : Fragment() {
ORDERS_FRAGMENT -> R.id.orderUnderUserFragment
TICKETS_FRAGMENT -> R.id.ticketsFragment
NOTIFICATION_FRAGMENT -> R.id.notificationFragment
SPEAKERS_CALL_FRAGMENT -> R.id.speakersCallFragment
else -> R.id.eventsFragment
}
findNavController(rootView).popBackStack(destinationId, false)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/fossasia/openevent/general/auth/SignUpFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import androidx.navigation.fragment.navArgs
import org.fossasia.openevent.general.event.EVENT_DETAIL_FRAGMENT
import org.fossasia.openevent.general.notification.NOTIFICATION_FRAGMENT
import org.fossasia.openevent.general.order.ORDERS_FRAGMENT
import org.fossasia.openevent.general.speakercall.SPEAKERS_CALL_FRAGMENT
import org.fossasia.openevent.general.ticket.TICKETS_FRAGMENT
import org.jetbrains.anko.design.longSnackbar
import org.jetbrains.anko.design.snackbar
Expand Down Expand Up @@ -261,6 +262,7 @@ class SignUpFragment : Fragment() {
ORDERS_FRAGMENT -> R.id.orderUnderUserFragment
TICKETS_FRAGMENT -> R.id.ticketsFragment
NOTIFICATION_FRAGMENT -> R.id.notificationFragment
SPEAKERS_CALL_FRAGMENT -> R.id.speakersCallFragment
else -> R.id.eventsFragment
}
findNavController(rootView).popBackStack(destinationId, false)
Expand Down
17 changes: 17 additions & 0 deletions app/src/main/java/org/fossasia/openevent/general/auth/UserIdConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package org.fossasia.openevent.general.auth

import androidx.room.TypeConverter

class UserIdConverter {
@TypeConverter
fun fromUserId(userId: UserId?): Long? {
return userId?.id
}

@TypeConverter
fun toUserId(id: Long?): UserId? {
return id?.let {
UserId(it)
}
}
}
6 changes: 5 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/di/Modules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ import org.fossasia.openevent.general.paypal.Paypal
import org.fossasia.openevent.general.paypal.PaypalApi
import org.fossasia.openevent.general.search.GeoLocationViewModel
import org.fossasia.openevent.general.search.SearchLocationViewModel
import org.fossasia.openevent.general.speakercall.EditSpeakerViewModel
import org.fossasia.openevent.general.speakercall.SpeakersCallProposalViewModel
import org.fossasia.openevent.general.search.SearchTimeViewModel
import org.fossasia.openevent.general.search.SearchViewModel
import org.fossasia.openevent.general.search.LocationService
Expand Down Expand Up @@ -226,7 +228,9 @@ val viewModelModule = module {
viewModel { SponsorsViewModel(get(), get()) }
viewModel { NotificationViewModel(get(), get(), get(), get()) }
viewModel { AuthViewModel(get(), get(), get()) }
viewModel { SpeakersCallViewModel(get(), get()) }
viewModel { SpeakersCallViewModel(get(), get(), get(), get(), get()) }
viewModel { SpeakersCallProposalViewModel(get(), get()) }
viewModel { EditSpeakerViewModel(get(), get(), get(), get()) }
}

val networkModule = module {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ class EventDetailsFragment : Fragment() {
R.id.call_for_speakers -> {
eventViewModel.event.value?.let {
findNavController(rootView).navigate(EventDetailsFragmentDirections
.actionEventDetailsToSpeakersCall(it.id, it.timezone))
.actionEventDetailsToSpeakersCall(it.identifier, it.id, it.timezone))
}
true
}
Expand Down
Loading