Skip to content
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

refactor: Event field, organizer to owner #2057

Merged
merged 1 commit into from
Jul 3, 2019
Merged

refactor: Event field, organizer to owner #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions app/schemas/org.fossasia.openevent.general.OpenEventDatabase/7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"formatVersion": 1,
"database": {
"version": 7,
"identityHash": "9eb49166f82304a9b5132dfa28d8e6ca",
"identityHash": "bf12d8e7557281fa0414606f818fac5e",
"entities": [
{
"tableName": "Event",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `identifier` TEXT NOT NULL, `startsAt` TEXT NOT NULL, `endsAt` TEXT NOT NULL, `timezone` TEXT NOT NULL, `privacy` TEXT NOT NULL, `paymentCountry` TEXT, `paypalEmail` TEXT, `thumbnailImageUrl` TEXT, `schedulePublishedOn` TEXT, `paymentCurrency` TEXT, `organizerDescription` TEXT, `originalImageUrl` TEXT, `onsiteDetails` TEXT, `organizerName` TEXT, `largeImageUrl` TEXT, `deletedAt` TEXT, `ticketUrl` TEXT, `locationName` TEXT, `codeOfConduct` TEXT, `state` TEXT, `searchableLocationName` TEXT, `description` TEXT, `pentabarfUrl` TEXT, `xcalUrl` TEXT, `logoUrl` TEXT, `externalEventUrl` TEXT, `iconImageUrl` TEXT, `icalUrl` TEXT, `createdAt` TEXT, `bankDetails` TEXT, `chequeDetails` TEXT, `isComplete` INTEGER NOT NULL, `latitude` REAL, `longitude` REAL, `refundPolicy` TEXT, `orderExpiryTime` INTEGER NOT NULL, `canPayByStripe` INTEGER NOT NULL, `canPayByCheque` INTEGER NOT NULL, `canPayByBank` INTEGER NOT NULL, `canPayByPaypal` INTEGER NOT NULL, `canPayOnsite` INTEGER NOT NULL, `isSponsorsEnabled` INTEGER NOT NULL, `hasOrganizerInfo` INTEGER NOT NULL, `isSessionsSpeakersEnabled` INTEGER NOT NULL, `isTicketingEnabled` INTEGER NOT NULL, `isTaxEnabled` INTEGER NOT NULL, `isMapShown` INTEGER NOT NULL, `favorite` INTEGER NOT NULL, `eventTopic` TEXT, `eventType` TEXT, `eventSubTopic` TEXT, `speakersCall` TEXT, PRIMARY KEY(`id`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `identifier` TEXT NOT NULL, `startsAt` TEXT NOT NULL, `endsAt` TEXT NOT NULL, `timezone` TEXT NOT NULL, `privacy` TEXT NOT NULL, `paymentCountry` TEXT, `paypalEmail` TEXT, `thumbnailImageUrl` TEXT, `schedulePublishedOn` TEXT, `paymentCurrency` TEXT, `ownerDescription` TEXT, `originalImageUrl` TEXT, `onsiteDetails` TEXT, `ownerName` TEXT, `largeImageUrl` TEXT, `deletedAt` TEXT, `ticketUrl` TEXT, `locationName` TEXT, `codeOfConduct` TEXT, `state` TEXT, `searchableLocationName` TEXT, `description` TEXT, `pentabarfUrl` TEXT, `xcalUrl` TEXT, `logoUrl` TEXT, `externalEventUrl` TEXT, `iconImageUrl` TEXT, `icalUrl` TEXT, `createdAt` TEXT, `bankDetails` TEXT, `chequeDetails` TEXT, `isComplete` INTEGER NOT NULL, `latitude` REAL, `longitude` REAL, `refundPolicy` TEXT, `orderExpiryTime` INTEGER NOT NULL, `canPayByStripe` INTEGER NOT NULL, `canPayByCheque` INTEGER NOT NULL, `canPayByBank` INTEGER NOT NULL, `canPayByPaypal` INTEGER NOT NULL, `canPayOnsite` INTEGER NOT NULL, `isSponsorsEnabled` INTEGER NOT NULL, `hasOwnerInfo` INTEGER NOT NULL, `isSessionsSpeakersEnabled` INTEGER NOT NULL, `isTicketingEnabled` INTEGER NOT NULL, `isTaxEnabled` INTEGER NOT NULL, `isMapShown` INTEGER NOT NULL, `favorite` INTEGER NOT NULL, `eventTopic` TEXT, `eventType` TEXT, `eventSubTopic` TEXT, `speakersCall` TEXT, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
Expand Down Expand Up @@ -81,8 +81,8 @@
"notNull": false
},
{
"fieldPath": "organizerDescription",
"columnName": "organizerDescription",
"fieldPath": "ownerDescription",
"columnName": "ownerDescription",
"affinity": "TEXT",
"notNull": false
},
Expand All @@ -99,8 +99,8 @@
"notNull": false
},
{
"fieldPath": "organizerName",
"columnName": "organizerName",
"fieldPath": "ownerName",
"columnName": "ownerName",
"affinity": "TEXT",
"notNull": false
},
Expand Down Expand Up @@ -273,8 +273,8 @@
"notNull": true
},
{
"fieldPath": "hasOrganizerInfo",
"columnName": "hasOrganizerInfo",
"fieldPath": "hasOwnerInfo",
"columnName": "hasOwnerInfo",
"affinity": "INTEGER",
"notNull": true
},
Expand Down Expand Up @@ -1899,7 +1899,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, '9eb49166f82304a9b5132dfa28d8e6ca')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'bf12d8e7557281fa0414606f818fac5e')"
]
}
}
6 changes: 3 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/event/Event.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ data class Event(
val thumbnailImageUrl: String? = null,
val schedulePublishedOn: String? = null,
val paymentCurrency: String? = null,
val organizerDescription: String? = null,
val ownerDescription: String? = null,
val originalImageUrl: String? = null,
val onsiteDetails: String? = null,
val organizerName: String? = null,
val ownerName: String? = null,
val largeImageUrl: String? = null,
val deletedAt: String? = null,
val ticketUrl: String? = null,
Expand Down Expand Up @@ -65,7 +65,7 @@ data class Event(
val canPayByPaypal: Boolean = false,
val canPayOnsite: Boolean = false,
val isSponsorsEnabled: Boolean = false,
val hasOrganizerInfo: Boolean = false,
val hasOwnerInfo: Boolean = false,
val isSessionsSpeakersEnabled: Boolean = false,
val isTicketingEnabled: Boolean = false,
val isTaxEnabled: Boolean = false,
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 @@ -349,7 +349,7 @@ class EventDetailsFragment : Fragment() {
.into(rootView.eventImage)

// Organizer Section
if (!event.organizerName.isNullOrEmpty()) {
if (!event.ownerName.isNullOrEmpty()) {
val organizerDescriptionListener = View.OnClickListener {
if (rootView.seeMoreOrganizer.text == getString(R.string.see_more)) {
rootView.seeMoreOrganizer.text = getString(R.string.see_less)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/fossasia/openevent/general/ticket/TicketsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ class TicketsFragment : Fragment() {

private fun loadEventDetails(event: Event) {
rootView.eventName.text = event.name
rootView.organizerName.text = "by ${event.organizerName.nullToEmpty()}"
rootView.organizerName.text = "by ${event.ownerName.nullToEmpty()}"
val startsAt = EventUtils.getEventDateTime(event.startsAt, event.timezone)
val endsAt = EventUtils.getEventDateTime(event.endsAt, event.timezone)
rootView.time.text = EventUtils.getFormattedDateTimeRangeDetailed(startsAt, endsAt)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-land/item_card_order_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/organizer"
app:hideIfEmpty="@{event.organizerName}"
app:hideIfEmpty="@{event.ownerName}"
android:textSize="@dimen/text_size_large"
tools:text="@string/organizer" />

Expand All @@ -318,7 +318,7 @@
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
android:text="@{event.organizerName}"
android:text="@{event.ownerName}"
tools:text="@string/organizer_preview" />
</LinearLayout>
</LinearLayout>
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/res/layout/content_event.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
android:fontFamily="sans-serif-thin"
android:textColor="@color/dark_grey"
android:textStyle="bold"
android:text="@{`by ` +event.organizerName}"
app:hideIfEmpty="@{event.organizerName}"
android:text="@{`by ` +event.ownerName}"
app:hideIfEmpty="@{event.ownerName}"
app:layout_constraintEnd_toEndOf="@+id/eventName"
app:layout_constraintStart_toStartOf="@+id/eventName"
app:layout_constraintTop_toBottomOf="@+id/eventName"
Expand Down Expand Up @@ -347,7 +347,7 @@
android:layout_marginTop="@dimen/layout_margin_large"
android:descendantFocusability="blocksDescendants"
android:orientation="vertical"
app:hideIfEmpty="@{event.organizerName}"
app:hideIfEmpty="@{event.ownerName}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -400,7 +400,7 @@
android:id="@+id/organizerName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{event.organizerName}"
android:text="@{event.ownerName}"
android:layout_marginBottom="@dimen/layout_margin_medium"
android:textColor="@color/light_grey"
android:textSize="@dimen/event_details_headers" />
Expand All @@ -409,8 +409,8 @@
android:id="@+id/eventOrganiserDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:strippedHtml="@{event.organizerDescription}"
app:hideIfEmpty="@{event.organizerDescription}"
app:strippedHtml="@{event.ownerDescription}"
app:hideIfEmpty="@{event.ownerDescription}"
android:layout_marginBottom="@dimen/layout_margin_small"
android:ellipsize="end"
android:lines="3"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/item_card_order_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
android:layout_height="wrap_content"
android:text="@string/organizer"
android:textSize="@dimen/text_size_medium"
app:hideIfEmpty="@{event.organizerName}"
app:hideIfEmpty="@{event.ownerName}"
tools:text="@string/organizer" />

<TextView
Expand All @@ -336,7 +336,7 @@
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="@dimen/text_size_large"
android:text="@{event.organizerName}"
android:text="@{event.ownerName}"
tools:text="@string/organizer_preview" />

<Button
Expand Down