Skip to content

Commit

Permalink
fix: Use correct values for tickets, sales and orders (#1910)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShridharGoel @iamareebjamal
ShridharGoel authored and iamareebjamal committed Aug 19, 2019
1 parent 1f42d46 commit b91f798
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
12 changes: 8 additions & 4 deletions app/src/main/res/layout/event_layout.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
<variable
name="selectedEventId"
type="Long" />

<variable
name="orderStats"
type="com.eventyay.organizer.data.order.OrderStatistics" />
</data>

<LinearLayout
Expand Down Expand Up @@ -55,13 +59,13 @@
app:circular_progress_color='@{"light_blue"}'
app:cpb_background_progressbar_width="5dp"
app:cpb_progressbar_width="10dp"
app:progress_with_animation="@{event.ticketsAvailable == 0 ? 0 : (int) ((event.ticketsSold*100)/event.ticketsAvailable)}" />
app:progress_with_animation="@{orderStats.tickets.total == 0 ? 0 : (int) ((orderStats.tickets.completed*100)/orderStats.tickets.total)}" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text='@{(event.ticketsAvailable == 0 ? 0 : (int) ((event.ticketsSold*100)/event.ticketsAvailable)) + "%"}'
android:text='@{(orderStats.tickets.total == 0 ? 0 : (int) ((orderStats.tickets.completed*100)/orderStats.tickets.total)) + "%"}'
android:textSize="@dimen/text_size_normal" />

</FrameLayout>
Expand Down Expand Up @@ -140,14 +144,14 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/spacing_medium"
android:layout_marginStart="@dimen/spacing_medium"
android:text="@{event.ticketsSold}"
android:text="@{orderStats.tickets.completed}"
android:textSize="@dimen/text_size_normal"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{"/" + event.ticketsAvailable}'
android:text='@{"/" + orderStats.tickets.total}'
android:textSize="@dimen/text_size_small" />

</LinearLayout>
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/layout/fragment_event_details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
android:layout_marginLeft="@dimen/spacing_normal"
android:layout_marginTop="@dimen/spacing_normal"
android:layout_marginBottom="@dimen/spacing_normal"
android:text='@{ContextManager.getCurrency() + " " + event.analytics.totalSale}'
android:text='@{ContextManager.getCurrency() + " " + orderStats.sales.total}'
android:textColor="@color/color_accent"
android:textSize="@dimen/text_size_extra_large"
bind:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -301,14 +301,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{event.analytics.totalAttendees}"
android:text="@{orderStats.tickets.completed}"
android:textSize="20sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{"/" + event.analytics.totalTickets}'
android:text='@{"/" + event.ticketsAvailable}'
android:textSize="@dimen/text_size_small" />

</LinearLayout>
Expand Down Expand Up @@ -338,15 +338,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:max="100"
android:progress="@{event.analytics.totalTickets == 0 ? 0 : (int) ((event.analytics.totalAttendees*100)/event.analytics.totalTickets)}" />
android:progress="@{event.ticketsAvailable == 0 ? 0 : (int) ((orderStats.tickets.completed*100)/event.ticketsAvailable)}" />

<TextView
android:id="@+id/tv_tickets_progress_percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_extra_small"
android:layout_marginLeft="@dimen/spacing_extra_small"
android:text='@{(event.analytics.totalTickets == 0 ? 0 : (int) ((event.analytics.totalAttendees*100)/event.analytics.totalTickets)) + "%"}' />
android:text='@{(event.ticketsAvailable == 0 ? 0 : (int) ((orderStats.tickets.completed*100)/event.ticketsAvailable)) + "%"}' />

</LinearLayout>

Expand Down Expand Up @@ -382,7 +382,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{"/" + event.analytics.totalAttendees}'
android:text='@{"/" + orderStats.tickets.completed}'
android:textSize="@dimen/text_size_small" />

</LinearLayout>
Expand Down Expand Up @@ -412,14 +412,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:max="100"
android:progress="@{event.analytics.totalAttendees == 0 ? 0 : (int) ((event.analytics.checkedIn*100)/event.analytics.totalAttendees)}" />
android:progress="@{orderStats.tickets.completed == 0 ? 0 : (int) ((event.analytics.checkedIn*100)/orderStats.tickets.completed)}" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_extra_small"
android:layout_marginLeft="@dimen/spacing_extra_small"
android:text='@{(event.analytics.totalAttendees == 0 ? 0 : (int) ((event.analytics.checkedIn*100)/event.analytics.totalAttendees)) + "%"}' />
android:text='@{(orderStats.tickets.completed == 0 ? 0 : (int) ((event.analytics.checkedIn*100)/orderStats.tickets.completed)) + "%"}' />

</LinearLayout>

Expand Down

0 comments on commit b91f798

Please sign in to comment.