Fix error leave during payment

badetitou
1 parent 3e933aa6
Showing 10 changed files with 141 additions and 71 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/PaiementEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/PaiementConsommation.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java
app/src/main/java/net/plil/clubinfo/etunicorn/utils/VolleyUtils.java
app/src/main/res/layout/fragment_crediter.xml
app/src/main/res/layout/fragment_debiter.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values/strings.xml
@@ -66,11 +66,13 @@ public class PaiementEvent extends DialogFragment {
                 .setView(view)
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        // User cancelled the dialog
+                        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll("PAYMENT");
                     }
                 });
         // Create the AlertDialog object and return it
-        return builder.create();
+        Dialog dialog =  builder.create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
     }
@@ -101,6 +103,7 @@ public class PaiementEvent extends DialogFragment {
         }
         );
+        jsonObjectRequest.setTag("PAYMENT");
         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
     }
 }
@@ -63,7 +63,7 @@ public class MainActivity extends AppCompatActivity
     private Toolbar toolbar;
     private AppBarLayout appBarLayout;
-    private List<Consommation> consommationsToModify = new ArrayList<>();
+    private Personne p;
     NfcAdapter mAdapter;
     PendingIntent mPendingIntent;
@@ -74,7 +74,7 @@ public class MainActivity extends AppCompatActivity
         // config tabbed pan
         Intent intent = this.getIntent();
-        Personne p = (Personne) intent.getSerializableExtra("user");
+        p = (Personne) intent.getSerializableExtra("user");
         //TODO remove this line
         Toast.makeText(getApplicationContext(), p.getRole().getPermissions().get(0).getNom(), Toast.LENGTH_SHORT).show();
         if (p.getRole().getPermissions().get(0).getNom().equals("ROLE_ADMIN")){
@@ -71,11 +71,14 @@ public class PaiementConsommation extends DialogFragment {
                 .setView(view)
                 .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        // User cancelled the dialog
+                        VolleyUtils.getInstance(getContext()).getRequestQueue().cancelAll("PAYMENT");
                     }
                 });
         // Create the AlertDialog object and return it
-        return builder.create();
+
+        Dialog dialog =  builder.create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
     }
@@ -105,7 +108,7 @@ public class PaiementConsommation extends DialogFragment {
             }
         }
         );
-
+        jsonObjectRequest.setTag("PAYMENT");
         VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
     }
 }
@@ -2,6 +2,8 @@ package net.plil.clubinfo.etunicorn.app.credit;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.Snackbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +17,7 @@ import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
 import net.plil.clubinfo.etunicorn.app.FragmentNFC;
+import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
@@ -24,6 +27,7 @@ public class Crediter extends FragmentNFC {
     private EditText mMoneyEditText;
     private ProgressBar mProgressBar;
+    private CoordinatorLayout coordinatorLayout;
     public Crediter() {
         // Required empty public constructor
@@ -44,6 +48,7 @@ public class Crediter extends FragmentNFC {
         View view = inflater.inflate(R.layout.fragment_crediter, container, false);
         mMoneyEditText = (EditText) view.findViewById(R.id.crediter_ask_money);
         mProgressBar = (ProgressBar) view.findViewById(R.id.crediter_progress_bar);
+        coordinatorLayout = (CoordinatorLayout) view.findViewById(R.id.crediter_layout);
         return view;
     }
@@ -62,11 +67,17 @@ public class Crediter extends FragmentNFC {
     @Override
     public void processNFC(String idCardUser) {
+        if(mMoneyEditText.getText().toString().isEmpty()){
+            mMoneyEditText.setError(getString(R.string.error_enter_debit));
+            return;
+        }
         mProgressBar.setVisibility(View.VISIBLE);
+        mMoneyEditText.setVisibility(View.GONE);
         JSONObject jsonObject = new JSONObject();
         try {
-            jsonObject.put("participant", 1);
-            jsonObject.put("acteur", 2);
+            Personne p = new Personne();
+            p.setIdCarte(idCardUser);
+            jsonObject.put("participant", p);
             jsonObject.put("prix", Double.parseDouble(mMoneyEditText.getText().toString()));
         } catch (JSONException e){
             e.printStackTrace();
@@ -75,11 +86,16 @@ public class Crediter extends FragmentNFC {
             @Override
             public void onResponse(JSONObject response) {
                 mProgressBar.setVisibility(View.GONE);
+                mMoneyEditText.setText("");
+                mMoneyEditText.setVisibility(View.VISIBLE);
+                Snackbar.make(coordinatorLayout, "DONE", Snackbar.LENGTH_LONG).show();
             }
         }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
                 mProgressBar.setVisibility(View.GONE);
+                mMoneyEditText.setVisibility(View.VISIBLE);
+                Snackbar.make(coordinatorLayout, error.getMessage(), Snackbar.LENGTH_LONG).show();
             }
         }
         );
@@ -2,10 +2,12 @@ package net.plil.clubinfo.etunicorn.app.debit;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.Snackbar;
+import android.support.design.widget.TextInputEditText;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
 import android.widget.ProgressBar;
 import com.android.volley.Request;
@@ -15,6 +17,7 @@ import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
 import net.plil.clubinfo.etunicorn.app.FragmentNFC;
+import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
@@ -23,9 +26,9 @@ import org.json.JSONObject;
 public class Debiter extends FragmentNFC {
-    private EditText mMoneyEditText;
+    private TextInputEditText mMoneyEditText;
     private ProgressBar mProgressBar;
-
+    private CoordinatorLayout coordinatorLayout;
     public Debiter() {
         // Required empty public constructor
@@ -48,7 +51,8 @@ public class Debiter extends FragmentNFC {
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_debiter, container, false);
         mProgressBar = (ProgressBar) view.findViewById(R.id.debiter_progress);
-        mMoneyEditText = (EditText) view.findViewById(R.id.debiter_edit_text_money);
+        mMoneyEditText = (TextInputEditText) view.findViewById(R.id.debiter_edit_text_money);
+        coordinatorLayout = (CoordinatorLayout) view.findViewById(R.id.debiter_layout);
         return view;
     }
@@ -64,25 +68,39 @@ public class Debiter extends FragmentNFC {
     @Override
     public void processNFC(String iDCardUser) {
+        if(mMoneyEditText.getText().toString().isEmpty()){
+            mMoneyEditText.setError(getString(R.string.error_enter_debit));
+            return;
+        }
+        mMoneyEditText.setVisibility(View.GONE);
         mProgressBar.setVisibility(View.VISIBLE);
         JSONObject jsonObject = new JSONObject();
         //TODO verifier champ complet avant de construire la requete
         try {
-            jsonObject.put("participant", 1);
-            jsonObject.put("acteur", 2);
-            jsonObject.put("prix", Double.parseDouble(mMoneyEditText.getText().toString()));
+            Personne p = new Personne();
+            p.setIdCarte(iDCardUser);
+            jsonObject.put("participant", p);
+            jsonObject.put("prix", -Double.parseDouble(mMoneyEditText.getText().toString()));
+            mMoneyEditText.setError(null);
         } catch (JSONException e){
             e.printStackTrace();
         }
-        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/transaction/debit"   ,jsonObject , new Response.Listener<JSONObject>() {
+        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/transaction/credit"   ,jsonObject , new Response.Listener<JSONObject>() {
             @Override
             public void onResponse(JSONObject response) {
                 mProgressBar.setVisibility(View.GONE);
+                mMoneyEditText.setText("");
+                mMoneyEditText.setVisibility(View.VISIBLE);
+                Snackbar.make(coordinatorLayout, "DONE", Snackbar.LENGTH_LONG).show();
+
             }
         }, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError error) {
                 mProgressBar.setVisibility(View.GONE);
+                mMoneyEditText.setVisibility(View.VISIBLE);
+                Snackbar.make(coordinatorLayout, error.getMessage(), Snackbar.LENGTH_LONG).show();
+
             }
         }
         );
@@ -12,7 +12,7 @@ import com.android.volley.toolbox.Volley;
 public class VolleyUtils {
-    private static final String uri = "http://blablapatate";
+    private static final String uri = "http://192.168.0.21:8080/";
     private static final String version = "v1";
     public static final String baseUri = VolleyUtils.uri + VolleyUtils.version ;
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="net.plil.clubinfo.etunicorn.app.credit.Crediter">
-
-    <EditText
-        android:inputType="numberSigned|numberDecimal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:hint="@string/enter_money"
-        android:id="@+id/crediter_ask_money"
-        android:ems="10"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"/>
-
-    <ProgressBar
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:id="@+id/crediter_progress_bar"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:visibility="gone"/>
-
-</RelativeLayout>
+    tools:context="net.plil.clubinfo.etunicorn.app.credit.Crediter"
+    android:id="@+id/crediter_layout">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true">
+
+            <android.support.design.widget.TextInputEditText
+                android:inputType="numberDecimal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:hint="@string/enter_money"
+                android:id="@+id/crediter_ask_money"
+                android:ems="10"
+                android:gravity="center"/>
+
+        </android.support.design.widget.TextInputLayout>
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/crediter_progress_bar"
+            android:visibility="gone"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true" />
+
+    </RelativeLayout>
+
+
+
+</android.support.design.widget.CoordinatorLayout>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="net.plil.clubinfo.etunicorn.app.debit.Debiter">
-
-
-    <EditText
-        android:inputType="numberSigned|numberDecimal"
-        android:ems="10"
-        android:id="@+id/debiter_edit_text_money"
-        android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
-        android:hint="@string/enter_money"
-        android:maxLines="1" />
-
-    <ProgressBar
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:id="@+id/debiter_progress"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:visibility="gone"/>
-</RelativeLayout>
+    tools:context="net.plil.clubinfo.etunicorn.app.credit.Crediter"
+    android:id="@+id/debiter_layout">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context="net.plil.clubinfo.etunicorn.app.debit.Debiter">
+
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
+            >
+
+            <android.support.design.widget.TextInputEditText
+                android:inputType="numberDecimal"
+                android:ems="10"
+                android:id="@+id/debiter_edit_text_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:hint="@string/enter_money"
+                android:maxLines="1" />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true"
+            android:id="@+id/debiter_progress"
+            android:visibility="gone"/>
+
+    </RelativeLayout>
+
+
+</android.support.design.widget.CoordinatorLayout>
@@ -40,4 +40,5 @@
     <string name="create_personne_login">Login</string>
     <string name="create_personne_naissance">Date de naissance</string>
     <string name="create_personne_role">Role</string>
+    <string name="error_enter_debit">Veuillez entrer une valeur avant d\'utiliser la carte NFC</string>
 </resources>
 \ No newline at end of file
@@ -41,4 +41,5 @@
     <string name="create_personne_carte">Card ID</string>
     <string name="create_personne_naissance">Birthday</string>
     <string name="create_personne_role">Role</string>
+    <string name="error_enter_debit">Please enter a value before using your NFC card</string>
 </resources>