feat: Add check-in restrictions in settings #1034

mooocer · 2018-06-08T04:29:37Z

Fixes #973

Changes: Adds check-in restrictions preferences for each ticket in Settings

GIF:

codecov · 2018-06-08T04:47:46Z

Codecov Report

Merging #1034 into development will decrease coverage by 0.52%.
The diff coverage is 0%.

@@                Coverage Diff                @@
##             development    #1034      +/-   ##
=================================================
- Coverage          27.25%   26.72%   -0.53%     
  Complexity           735      735              
=================================================
  Files                198      202       +4     
  Lines               7588     7738     +150     
  Branches             310      314       +4     
=================================================
  Hits                2068     2068              
- Misses              5434     5584     +150     
  Partials              86       86

Impacted Files	Coverage Δ	Complexity Δ
...org/fossasia/openevent/app/data/ticket/Ticket.java	`100% <ø> (ø)`	`1 <0> (ø)`	⬇️
...event/app/core/settings/EventSettingsFragment.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...ttings/restriction/CheckInRestrictionsAdapter.java	`0% <0%> (ø)`	`0 <0> (?)`
.../settings/restriction/TicketSettingsViewModel.java	`0% <0%> (ø)`	`0 <0> (?)`
...penevent/app/data/ticket/TicketRepositoryImpl.java	`73.33% <0%> (-6.88%)`	`18 <0> (ø)`
...core/settings/restriction/CheckInRestrictions.java	`0% <0%> (ø)`	`0 <0> (?)`
...sia/openevent/app/core/main/FragmentNavigator.java	`40.74% <0%> (ø)`	`6 <0> (ø)`	⬇️
...e/settings/restriction/RestrictionsViewHolder.java	`0% <0%> (ø)`	`0 <0> (?)`
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dd60a42...0d6501c. Read the comment docs.

Masquerade0097 · 2018-07-18T18:45:42Z

app/src/main/java/org/fossasia/openevent/app/core/settings/EventSettingsFragment.java

@@ -51,6 +67,16 @@ public void onCreatePreferencesFix(@Nullable Bundle bundle, String rootKey) {
                .commit();
            return true;
        });
+
+
+        findPreference("check_in_restrictions").setOnPreferenceClickListener(preference -> {


Avoid using string literals

Masquerade0097 · 2018-07-18T18:48:14Z

app/src/main/java/org/fossasia/openevent/app/core/settings/restriction/CheckInRestrAdapter.java

+
+import java.util.List;
+
+public class CheckInRestrAdapter extends RecyclerView.Adapter<CheckInRestrAdapter.TicketViewHolder> {


Use complete name

Masquerade0097 · 2018-07-18T18:51:51Z

app/src/main/java/org/fossasia/openevent/app/core/settings/restriction/CheckInRestrAdapter.java

+        notifyDataSetChanged();
+    }
+
+    class TicketViewHolder extends RecyclerView.ViewHolder {


Make a separate class, follow principle of separation of concerns.

Masquerade0097 · 2018-07-18T18:53:39Z

.../main/java/org/fossasia/openevent/app/core/settings/restriction/TicketSettingsViewModel.java

+    }
+
+    public void updateTicket(Ticket ticket) {
+


Unnecessary line break

Masquerade0097 · 2018-07-18T18:53:54Z

.../main/java/org/fossasia/openevent/app/core/settings/restriction/TicketSettingsViewModel.java

+    }
+
+    public void loadTickets() {
+


Unnecessary line break

Masquerade0097 · 2018-07-18T18:54:13Z

.../main/java/org/fossasia/openevent/app/core/settings/restriction/TicketSettingsViewModel.java

+    }
+
+    public void updateAllTickets(boolean toRestrict) {
+


Masquerade0097 · 2018-07-18T18:54:31Z

app/src/main/java/org/fossasia/openevent/app/data/ticket/TicketApi.java

@@ -27,4 +28,8 @@
    @DELETE("tickets/{id}")
    Completable deleteTicket(@Path("id") long id);

+    @PATCH("tickets/{ticket_id}")
+    Observable<Ticket> updateTicket(@Path("ticket_id") long id, @Body Ticket ticket);
+


Extra line break

Masquerade0097 · 2018-07-18T18:55:52Z

app/src/main/res/xml/event_preferences.xml

@@ -9,4 +9,8 @@
        android:key="payment_preferences"
        android:title="@string/payment_preference"/>

+    <Preference
+        android:key="check_in_restrictions"
+        android:title="Check In Restrictions"/>


Use string resources

Masquerade0097 · 2018-07-20T10:25:05Z

@MishuVS Why is there option for restricting ticket types which we arn't supporting? Please describe the significance for all the types used.

mooocer · 2018-07-20T11:19:06Z

@Masquerade0097

The items listed are individual ticket types and not the ticket categories (Free / Paid / Donation). The items shown are dynamic and not static, and are the tickets created by the organizer for an event.
Providing option to restrict check-in for each ticket makes more sense than to provide option to restrict check-in for ticket categories.
For example, in the case of having multiple paid tickets like: General Admission, and VIP, when an organizer has a special queue for VIP they can restrict check-in for General Admission - which isn't possible when you restrict ticket category Paid.
This is consistent with the implementation in the EventBrite app.

Masquerade0097 · 2018-07-21T12:24:52Z

app/src/main/java/org/fossasia/openevent/app/core/settings/EventSettingsFragment.java

            FragmentTransaction transaction = getFragmentManager().beginTransaction();
            transaction
                .replace(R.id.fragment_container, ScanSettings.newInstance())
                .addToBackStack(null)
                .commit();
            return true;
        });
+
+


Masquerade0097 · 2018-07-21T12:25:59Z

app/src/main/res/layout/ticket_settings_fragment.xml

+
+        <View
+            android:background="@color/grey_400"
+            android:layout_height="1dp"


Use dimens resource

Masquerade0097 · 2018-07-21T12:26:26Z

app/src/main/res/xml/event_preferences.xml

        android:title="@string/payment_preference"/>

+    <Preference
+        android:key="@string/check_in_restrictions_key"
+        android:title="Check In Restrictions"/>


String resource

Masquerade0097 · 2018-07-21T12:32:19Z

app/src/main/java/org/fossasia/openevent/app/core/settings/EventSettingsFragment.java

+
+
+        findPreference(getString(R.string.check_in_restrictions_key)).setOnPreferenceClickListener(preference -> {
+            FragmentTransaction transaction = getFragmentManager().beginTransaction();


I think Transaction should not be needed.

Masquerade0097 · 2018-07-21T12:33:07Z

app/src/main/java/org/fossasia/openevent/app/core/settings/EventSettingsFragment.java

@@ -43,14 +59,24 @@ public void onCreatePreferencesFix(@Nullable Bundle bundle, String rootKey) {
            return true;
        });

-        findPreference("scan_settings").setOnPreferenceClickListener(preference -> {
+        findPreference(getString(R.string.scan_settings_key)).setOnPreferenceClickListener(preference -> {
            FragmentTransaction transaction = getFragmentManager().beginTransaction();


Masquerade0097 · 2018-07-21T12:33:58Z

app/src/main/java/org/fossasia/openevent/app/core/settings/restriction/CheckInRestrictions.java

+
+        context = getContext();
+        if (getArguments() != null)
+            eventId = getArguments().getLong(MainActivity.EVENT_KEY);


Use brackets

Masquerade0097 · 2018-07-21T12:34:11Z

app/src/main/java/org/fossasia/openevent/app/core/settings/EventSettingsFragment.java

+        super.onCreate(savedInstanceState);
+
+        if (getArguments() != null)
+            eventId = getArguments().getLong(MainActivity.EVENT_KEY);


Use brackets

Masquerade0097 · 2018-07-21T12:36:38Z

app/src/main/java/org/fossasia/openevent/app/core/settings/restriction/CheckInRestrictions.java

+    private void checkRestrictAll() {
+        boolean restrictAll = true;
+
+        for (Ticket ticket : ticketSettingsViewModel.getTickets().getValue()) {


Can throw NPE ?

Masquerade0097 · 2018-07-21T12:41:12Z

.../main/java/org/fossasia/openevent/app/core/settings/restriction/TicketSettingsViewModel.java

+    }
+
+    public void loadTickets() {
+        compositeDisposable.add(ticketRepository.getTickets(eventId, true)


Pass eventId as argument, will be required for testing.

Masquerade0097 · 2018-07-21T12:48:24Z

app/src/main/res/layout/ticket_settings_fragment.xml

+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:text='@string/restrict_all'/>


Change to default text color and size.

There's no default style defined right now. Styles should be uniformly handled in other issue.

No, I didn't mean that you define some style. I meant that keep the text color as black and the text size similar to what we keep throughout the app. As per the gif, this screen is looking different with text size small and color grey.

mooocer · 2018-07-21T19:06:03Z

@Masquerade0097 @iamareebjamal Please review

Masquerade0097

Please resolve the style issue other than that LGTM

Changes done

mooocer · 2018-07-22T20:25:24Z

@iamareebjamal Please review

open-event-bot bot added the needs-review label Jun 8, 2018

open-event-bot bot assigned mooocer Jun 8, 2018

mooocer force-pushed the check-in branch from 38db3bd to cbb6791 Compare June 20, 2018 20:01

mooocer changed the title ~~[WIP] feat: Add check-in restrictions in settings~~ feat: Add check-in restrictions in settings Jun 20, 2018

mooocer force-pushed the check-in branch 2 times, most recently from 38f1c96 to bdcf66a Compare July 17, 2018 20:21

fossasia deleted a comment Jul 17, 2018

Masquerade0097 previously requested changes Jul 18, 2018

View reviewed changes

feat: add check-in restrictions preference

b6d03ea

mooocer force-pushed the check-in branch from bdcf66a to b6d03ea Compare July 20, 2018 09:13

fossasia deleted a comment Jul 20, 2018

Masquerade0097 reviewed Jul 21, 2018

View reviewed changes

fossasia deleted a comment Jul 21, 2018

mooocer force-pushed the check-in branch 2 times, most recently from b5f4959 to a530953 Compare July 22, 2018 06:02

fossasia deleted a comment Jul 22, 2018

Masquerade0097 reviewed Jul 22, 2018

View reviewed changes

feat: add check-in preference (minor changes)

1f323e5

mooocer force-pushed the check-in branch from e550665 to 1f323e5 Compare July 22, 2018 20:19

Merge branch 'development' into check-in

0d6501c

fossasia deleted a comment Jul 22, 2018

iamareebjamal approved these changes Jul 23, 2018

View reviewed changes

open-event-bot bot removed the needs-review label Jul 23, 2018

Masquerade0097 merged commit 2b0a816 into fossasia:development Jul 23, 2018

open-event-bot bot added the ready-to-ship label Jul 23, 2018

mooocer deleted the check-in branch July 23, 2018 13:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add check-in restrictions in settings #1034

feat: Add check-in restrictions in settings #1034

mooocer commented Jun 8, 2018 •

edited

Loading

codecov bot commented Jun 8, 2018 •

edited

Loading

Masquerade0097 Jul 18, 2018

Masquerade0097 Jul 18, 2018

Masquerade0097 Jul 18, 2018

Masquerade0097 Jul 18, 2018

Masquerade0097 Jul 18, 2018

Masquerade0097 Jul 18, 2018

Masquerade0097 Jul 18, 2018

Masquerade0097 Jul 18, 2018

Masquerade0097 commented Jul 20, 2018

mooocer commented Jul 20, 2018 •

edited

Loading

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018 •

edited

Loading

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018

Masquerade0097 Jul 21, 2018

mooocer Jul 21, 2018 •

edited

Loading

Masquerade0097 Jul 22, 2018 •

edited

Loading

mooocer commented Jul 21, 2018

Masquerade0097 left a comment

mooocer commented Jul 22, 2018


		import java.util.List;

		public class CheckInRestrAdapter extends RecyclerView.Adapter<CheckInRestrAdapter.TicketViewHolder> {



		findPreference(getString(R.string.check_in_restrictions_key)).setOnPreferenceClickListener(preference -> {
		FragmentTransaction transaction = getFragmentManager().beginTransaction();

feat: Add check-in restrictions in settings #1034

feat: Add check-in restrictions in settings #1034

Conversation

mooocer commented Jun 8, 2018 • edited Loading

codecov bot commented Jun 8, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Masquerade0097 commented Jul 20, 2018

mooocer commented Jul 20, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Masquerade0097 Jul 21, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mooocer Jul 21, 2018 • edited Loading

Choose a reason for hiding this comment

Masquerade0097 Jul 22, 2018 • edited Loading

Choose a reason for hiding this comment

mooocer commented Jul 21, 2018

Masquerade0097 left a comment

Choose a reason for hiding this comment

mooocer commented Jul 22, 2018

mooocer commented Jun 8, 2018 •

edited

Loading

codecov bot commented Jun 8, 2018 •

edited

Loading

mooocer commented Jul 20, 2018 •

edited

Loading

Masquerade0097 Jul 21, 2018 •

edited

Loading

mooocer Jul 21, 2018 •

edited

Loading

Masquerade0097 Jul 22, 2018 •

edited

Loading