Design create Consommation

badetitou
1 parent 393ff95e
Showing 6 changed files with 89 additions and 41 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/CreateConsommation.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/CreatePersonne.java
app/src/main/java/net/plil/clubinfo/etunicorn/data/Role.java
app/src/main/res/layout/fragment_create_consomation.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values/strings.xml
@@ -3,10 +3,14 @@ package net.plil.clubinfo.etunicorn.app.consommation;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
@@ -27,6 +31,8 @@ public class CreateConsommation extends DialogFragment {
     EditText mNomConsomation;
     EditText mPrice;
     ProgressBar mProgressBar;
+    TextInputLayout mNomInput;
+    TextInputLayout mPriceInput;
     @Override
@@ -37,46 +43,68 @@ public class CreateConsommation extends DialogFragment {
         mNomConsomation = (EditText) view.findViewById(R.id.create_consomation_name);
         mPrice = (EditText) view.findViewById(R.id.create_consomation_price);
         mProgressBar = (ProgressBar) view.findViewById(R.id.create_consomation_progress_bar);
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder
+        mNomInput = (TextInputLayout) view.findViewById(R.id.create_consomation_name_input);
+        mPriceInput = (TextInputLayout) view.findViewById(R.id.create_consomation_price_input);
+        AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.create_consumable)
                 .setView(view)
-                .setPositiveButton(R.string.valid, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-
-                        mProgressBar.setVisibility(View.VISIBLE);
-                        mPrice.setVisibility(View.GONE);
-                        mNomConsomation.setVisibility(View.GONE);
-                        JSONObject jsonObject = new JSONObject();
-                        try {
-                            jsonObject.put("nomConsomation", mNomConsomation.getText().toString());
-                            jsonObject.put("prix", Double.parseDouble(mPrice.getText().toString()));
-                        } catch (JSONException e){
-                            e.printStackTrace();
+                .setPositiveButton(R.string.valid, null)
+                .setNegativeButton(R.string.cancel, null)
+                .create();
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface dialog) {
+                Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
+                button.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        boolean testDateInputOk = true;
+                        if (mPrice.getText().toString().isEmpty()) {
+                            mPriceInput.setError(getString(R.string.error_create_consomation_input_price));
+                            testDateInputOk = false;
+                        } else {
+                            mPriceInput.setError(null);
+                        }
+                        if (mNomConsomation.getText().toString().isEmpty()){
+                            mNomInput.setError(getString(R.string.error_create_consomation_input_nom));
+                            testDateInputOk = false;
+                        } else {
+                            mNomInput.setError(null);
                         }
-                        JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/transaction/debit"   ,jsonObject , new Response.Listener<JSONObject>() {
-                            @Override
-                            public void onResponse(JSONObject response) {
-                                mProgressBar.setVisibility(View.GONE);
+                        if (testDateInputOk) {
+                            mPriceInput.setError(null);
+                            mNomInput.setError(null);
+                            mProgressBar.setVisibility(View.VISIBLE);
+                            mPriceInput.setVisibility(View.GONE);
+                            mNomInput.setVisibility(View.GONE);
+                            JSONObject jsonObject = new JSONObject();
+                            try {
+                                jsonObject.put("nomConsomation", mNomConsomation.getText().toString());
+                                jsonObject.put("prix", Double.parseDouble(mPrice.getText().toString()));
+                            } catch (JSONException e) {
+                                e.printStackTrace();
                             }
-                        }, new Response.ErrorListener() {
-                            @Override
-                            public void onErrorResponse(VolleyError error) {
-                                mProgressBar.setVisibility(View.GONE);
+                            JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/transaction/debit", jsonObject, new Response.Listener<JSONObject>() {
+                                @Override
+                                public void onResponse(JSONObject response) {
+                                    mProgressBar.setVisibility(View.GONE);
+                                    dismiss();
+                                }
+                            }, new Response.ErrorListener() {
+                                @Override
+                                public void onErrorResponse(VolleyError error) {
+                                    mProgressBar.setVisibility(View.GONE);
+                                    dismiss();
+                                }
                             }
+                            );
+                            VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
                         }
-                        );
-
-                        VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest);
-                    }
-                })
-                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        // User cancelled the dialog
                     }
                 });
-        // Create the AlertDialog object and return it
-        return builder.create();
+            }
+        });
+        return dialog;
     }
@@ -144,12 +144,13 @@ public class CreatePersonne extends DialogFragment {
             public void onResponse(JSONObject response) {
                 JSONArray jsonArray = null;
                 try {
+                    //TODO change this by the real name of the array
                     jsonArray = response.getJSONArray("roles");
                     arraySpinnerRole.clear();
                     for (int i =0; i<jsonArray.length();++i){
                         arraySpinnerRole.add(new Gson().fromJson(String.valueOf(jsonArray.getJSONObject(i)), Role.class));
                     }
-                    response.getJSONArray("hello").length();
+                    adapterRole.notifyDataSetChanged();
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
@@ -29,4 +29,9 @@ public class Role implements Serializable{
     public void setPermissions(List<Permission> permissions) {
         this.permissions = permissions;
     }
+
+    @Override
+    public String toString(){
+        return getName();
+    }
 }
@@ -7,19 +7,29 @@
     android:layout_height="match_parent"
     >
-    <EditText
+    <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/create_consomation_name"
-        android:hint="@string/create_consumable_name"/>
+        android:id="@+id/create_consomation_name_input">
+        <android.support.design.widget.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/create_consomation_name"
+            android:hint="@string/create_consumable_name"/>
+    </android.support.design.widget.TextInputLayout>
-    <EditText
+    <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:hint="@string/create_consumable_price"
-        android:id="@+id/create_consomation_price"
-        android:inputType="numberSigned|numberDecimal"
-        android:maxLines="1" />
+        android:id="@+id/create_consomation_price_input">
+        <android.support.design.widget.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:hint="@string/create_consumable_price"
+            android:id="@+id/create_consomation_price"
+            android:inputType="numberSigned|numberDecimal"
+            android:maxLines="1" />
+    </android.support.design.widget.TextInputLayout>
     <ProgressBar
         style="?android:attr/progressBarStyle"
@@ -41,4 +41,6 @@
     <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>
+    <string name="error_create_consomation_input_nom">Entrer le nom</string>
+    <string name="error_create_consomation_input_price">Entrer le prix</string>
 </resources>
 \ No newline at end of file
@@ -42,4 +42,6 @@
     <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>
+    <string name="error_create_consomation_input_price">Enter the price</string>
+    <string name="error_create_consomation_input_nom">Enter the name</string>
 </resources>