Correctif/PATCH

badetitou
1 parent be13b838
Showing 16 changed files with 377 additions and 28 deletions Show diff stats
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/EventFragment.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/ModifyEvent.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/LoginActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Crediter.java -> app/src/main/java/net/plil/clubinfo/etunicorn/app/credit/Crediter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/Debiter.java -> app/src/main/java/net/plil/clubinfo/etunicorn/app/debit/Debiter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/MyPersonneRecyclerViewAdapter.java
app/src/main/java/net/plil/clubinfo/etunicorn/app/personne/PersonneFragment.java
app/src/main/java/net/plil/clubinfo/etunicorn/data/Permission.java
app/src/main/java/net/plil/clubinfo/etunicorn/data/Role.java
app/src/main/java/net/plil/clubinfo/etunicorn/utils/VolleyUtils.java
app/src/main/res/layout/fragment_consomation_item.xml
app/src/main/res/layout/fragment_crediter.xml
app/src/main/res/layout/fragment_debiter.xml
app/src/main/res/layout/fragment_event.xml
app/src/main/res/layout/fragment_event_list.xml
@@ -8,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 import net.plil.clubinfo.etunicorn.R;
 import net.plil.clubinfo.etunicorn.app.FragmentNFC;
@@ -93,7 +94,13 @@ public class EventFragment extends FragmentNFC {
     @Override
     public void processNFC(String idCardUser) {
-
+        PaiementEvent paiementEvent = (PaiementEvent) getFragmentManager().findFragmentByTag("paiementEvent");
+        if (paiementEvent == null){
+            Toast.makeText(getContext(), R.string.payment_consumable_alert_no_selection, Toast.LENGTH_LONG).show();
+        }
+        else {
+            paiementEvent.processNFC();
+        }
     }
     /**
@@ -71,6 +71,7 @@ public class ModifyEvent extends DialogFragment {
                         mProgressBar.setVisibility(View.VISIBLE);
                         mPrice.setVisibility(View.GONE);
                         mNom.setVisibility(View.GONE);
+                        mDate.setVisibility(View.GONE);
                         JSONObject jsonObject = new JSONObject();
                         try {
                             jsonObject.put("nomEvenement", mNom.getText().toString());
@@ -39,6 +39,7 @@ import com.android.volley.toolbox.JsonObjectRequest;
 import com.google.gson.Gson;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.data.Permission;
 import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.data.User;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
@@ -176,9 +177,16 @@ public class LoginActivity extends AppCompatActivity {
                 public void onResponse(JSONObject response) {
                     showProgress(false);
-                        Toast.makeText(getApplicationContext(),  response.toString(), Toast.LENGTH_LONG).show();
-                        //Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-                        //startActivity(intent);
+                    Toast.makeText(getApplicationContext(),  response.toString(), Toast.LENGTH_LONG).show();
+                    Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+                    //TODO real interpretation when login work
+                    //Personne p = new Gson().fromJson(String.valueOf(response), Personne.class);
+                    Personne p = new Personne();
+                    Permission permission = new Permission();
+                    permission.setNom("ROLE_ADMIN");
+                    p.getRole().getPermissions().add(permission);
+                    intent.putExtra("user", p);
+                    startActivity(intent);
                 }
             }, new Response.ErrorListener() {
                 @Override
@@ -186,12 +194,17 @@ public class LoginActivity extends AppCompatActivity {
                     showProgress(false);
                     Toast.makeText(getApplicationContext(), "error : " + error.getCause(), Toast.LENGTH_SHORT).show();
                     Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+
+                    Personne p = new Personne();
+                    Permission permission = new Permission();
+                    permission.setNom("ROLE_ADMIN");
+                    p.getRole().getPermissions().add(permission);
+                    intent.putExtra("user", p);
+
                     startActivity(intent);
-                    // END
                 }
             }
             );
-            Toast.makeText(getApplicationContext(), new Gson().toJson(user), Toast.LENGTH_LONG).show();
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -15,21 +15,29 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.Toast;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.credit.Crediter;
+import net.plil.clubinfo.etunicorn.app.debit.Debiter;
 import net.plil.clubinfo.etunicorn.app.event.EventFragment;
 import net.plil.clubinfo.etunicorn.app.event.PaiementEvent;
 import net.plil.clubinfo.etunicorn.app.consommation.FragmentConsommation;
 import net.plil.clubinfo.etunicorn.app.consommation.PaiementConsommation;
+import net.plil.clubinfo.etunicorn.app.personne.PersonneFragment;
 import net.plil.clubinfo.etunicorn.data.Consommation;
 import net.plil.clubinfo.etunicorn.data.Event;
+import net.plil.clubinfo.etunicorn.data.Personne;
 import net.plil.clubinfo.etunicorn.utils.ConvertBytesToString;
 import java.util.ArrayList;
 import java.util.List;
-public class MainActivity extends AppCompatActivity implements FragmentConsommation.OnListFragmentInteractionListener, EventFragment.OnListFragmentInteractionListener{
+public class MainActivity extends AppCompatActivity
+        implements FragmentConsommation.OnListFragmentInteractionListener,
+        EventFragment.OnListFragmentInteractionListener,
+        PersonneFragment.OnListFragmentInteractionListener{
     /**
      * The {@link android.support.v4.view.PagerAdapter} that will provide
@@ -41,6 +49,8 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
      */
     private SectionsPagerAdapter mSectionsPagerAdapter;
+    private int nbPages = 0;
+
     /**
      * The {@link ViewPager} that will host the section contents.
      */
@@ -56,10 +66,34 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // config tabbed pan
+        Intent intent = this.getIntent();
+        Personne p = (Personne) intent.getSerializableExtra("user");
+        Toast.makeText(getApplicationContext(), p.getRole().getPermissions().get(0).getNom(), Toast.LENGTH_LONG).show();
+        if (p.getRole().getPermissions().get(0).getNom().equals("ROLE_ADMIN")){
+            nbPages = 5;
+            Action.CONSOMATION.setValue(2);
+            Action.EVENT.setValue(3);
+            Action.PERSONNE.setValue(4);
+        } else if (p.getRole().getPermissions().get(0).getNom().equals("ROLE_BDE")){
+                nbPages = 4;
+                Action.CONSOMATION.setValue(-1);
+                Action.EVENT.setValue(2);
+                Action.PERSONNE.setValue(3);
+        } else if (p.getRole().getPermissions().get(0).getNom().equals("ROLE_BAR")){
+            nbPages = 3;
+            Action.CONSOMATION.setValue(2);
+            Action.EVENT.setValue(-1);
+            Action.PERSONNE.setValue(-1);
+        } else {
+            nbPages = 2;
+        }
+
+        // config other stuff
         setContentView(R.layout.activity_main);
         appBarLayout = (AppBarLayout) findViewById(R.id.appbar);
-
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -154,6 +188,16 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
     }
+    @Override
+    public void onListFragmentInteraction(Personne personne) {
+
+    }
+
+    @Override
+    public void onListFragmentInteractionLong(Personne personne) {
+
+    }
+
     /**
      * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
      * one of the sections/tabs/pages.
@@ -174,13 +218,15 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
                 return FragmentConsommation.newInstance();
             else if (position == Action.EVENT.getValue())
                 return EventFragment.newInstance();
+            else if (position == Action.PERSONNE.getValue())
+                return PersonneFragment.newInstance();
             else
                 return null;
         }
         @Override
         public int getCount() {
-            return 4;
+            return nbPages;
         }
         @Override
@@ -193,14 +239,16 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
                 return "Consommation";
             else if(position == Action.EVENT.getValue())
                 return getString(R.string.event);
+            else if(position == Action.PERSONNE.getValue())
+                return getString(R.string.personne);
             return null;
         }
     }
     private enum Action {
-        DEBITER(0), CREDITER(1), CONSOMATION(2), EVENT(3);
+        DEBITER(0), CREDITER(1), CONSOMATION(2), EVENT(3), PERSONNE(4);
-        private final int value;
+        private int value;
         Action(int value) {
             this.value = value;
         }
@@ -208,5 +256,9 @@ public class MainActivity extends AppCompatActivity implements FragmentConsommat
         public int getValue() {
             return value;
         }
+
+        public void setValue(int value) {
+            this.value = value;
+        }
     }
 }
-package net.plil.clubinfo.etunicorn.app;
+package net.plil.clubinfo.etunicorn.app.credit;
 import android.content.Context;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 import com.android.volley.Request;
 import com.android.volley.Response;
@@ -17,6 +14,7 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
 import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.FragmentNFC;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
-package net.plil.clubinfo.etunicorn.app;
+package net.plil.clubinfo.etunicorn.app.debit;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import net.plil.clubinfo.etunicorn.R;
-import net.plil.clubinfo.etunicorn.data.Personne;
+import net.plil.clubinfo.etunicorn.app.FragmentNFC;
 import net.plil.clubinfo.etunicorn.utils.VolleyUtils;
 import org.json.JSONException;
@@ -0,0 +1,120 @@
+package net.plil.clubinfo.etunicorn.app.personne;
+
+import android.content.Context;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.data.Personne;
+
+import java.util.List;
+import java.util.Locale;
+
+public class MyPersonneRecyclerViewAdapter extends RecyclerView.Adapter<MyPersonneRecyclerViewAdapter.ViewHolder> {
+
+    private final List<Personne> mValues;
+    private final PersonneFragment.OnListFragmentInteractionListener mListener;
+    private final Context context;
+
+
+    public MyPersonneRecyclerViewAdapter(List<Personne> items, PersonneFragment.OnListFragmentInteractionListener listener, Context context) {
+        mValues = items;
+        mListener = listener;
+        this.context = context;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.fragment_personne, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(final ViewHolder holder, int position) {
+        holder.mItem = mValues.get(position);
+        holder.mLogin.setText(mValues.get(position).getLoginPoly());
+        holder.mCarte.setText(mValues.get(position).getIdCarte());
+        holder.mRole.setText(mValues.get(position).getRole().getName());
+        holder.mSolde.setText(String.format(Locale.FRANCE, "%.2f", mValues.get(position).getSolde()));
+
+        holder.mView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != mListener) {
+                    mListener.onListFragmentInteraction(holder.mItem);
+                }
+            }
+        });
+
+        holder.mView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                mListener.onListFragmentInteractionLong(holder.mItem);
+                return true;
+            }
+        });
+
+        holder.mButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final PopupMenu popup = new PopupMenu(v.getContext(), holder.mButton);
+                //inflating menu from xml resource
+                popup.inflate(R.menu.option_list);
+                //adding click listener
+                popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem item) {
+                        switch (item.getItemId()) {
+                            case R.id.delete:
+                                DeletePersonne deletePersonne = DeletePersonne.newInstance(holder.mItem);
+                                deletePersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), "deleteConsommation");
+                                break;
+                            case R.id.modify:
+                                ModifyPersonne modifyPersonne = ModifyPersonne.newInstance(holder.mItem);
+                                modifyPersonne.show(((AppCompatActivity) context).getSupportFragmentManager(), "modifyConsommation");
+                                break;
+                        }
+                        return false;
+                    }
+                });
+                //displaying the popup
+                popup.show();
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return mValues.size();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        public final View mView;
+        public final TextView mLogin;
+        public final TextView mCarte;
+        public final TextView mRole;
+        public final TextView mSolde;
+        public final TextView mButton;
+        public Personne mItem;
+
+        public ViewHolder(View view) {
+            super(view);
+            mView = view;
+            mLogin = (TextView) view.findViewById(R.id.personne_login);
+            mCarte = (TextView) view.findViewById(R.id.personne_carte);
+            mRole = (TextView) view.findViewById(R.id.personne_role);
+            mSolde = (TextView) view.findViewById(R.id.personne_solde);
+            mButton = (TextView) view.findViewById(R.id.personne_options);
+
+
+        }
+    }
+}
@@ -0,0 +1,110 @@
+package net.plil.clubinfo.etunicorn.app.personne;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.ListPopupWindow;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import net.plil.clubinfo.etunicorn.R;
+import net.plil.clubinfo.etunicorn.app.FragmentNFC;
+import net.plil.clubinfo.etunicorn.data.Personne;
+
+import java.sql.Date;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * A fragment representing a list of Items.
+ * <p/>
+ * Activities containing this fragment MUST implement the {@link OnListFragmentInteractionListener}
+ * interface.
+ */
+public class PersonneFragment extends FragmentNFC {
+
+    private OnListFragmentInteractionListener mListener;
+
+    /**
+     * Mandatory empty constructor for the fragment manager to instantiate the
+     * fragment (e.g. upon screen orientation changes).
+     */
+    public PersonneFragment() {
+    }
+
+    public static PersonneFragment newInstance() {
+        return new PersonneFragment();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_personne_list, container, false);
+
+        // Set the adapter
+        Context context = view.getContext();
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.personne_list);
+        recyclerView.setLayoutManager(new LinearLayoutManager(context));
+
+        List<Personne> personneList = new ArrayList<>();
+        for (int i = 0;i<150;++i){
+            Personne p = new Personne();
+            p.setIdCarte("15245698547856");
+            p.setLoginPoly("bverhaeg");
+            p.setNaissance(new Date(System.currentTimeMillis()));
+            p.setSolde(45);
+
+            personneList.add(p);
+
+            recyclerView.setAdapter(new MyPersonneRecyclerViewAdapter(personneList, mListener, getActivity()));
+        }
+        return view;
+    }
+
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnListFragmentInteractionListener) {
+            mListener = (OnListFragmentInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnListFragmentInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    @Override
+    public void processNFC(String idCardUser) {
+
+    }
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     * <p/>
+     * See the Android Training lesson <a href=
+     * "http://developer.android.com/training/basics/fragments/communicating.html"
+     * >Communicating with Other Fragments</a> for more information.
+     */
+    public interface OnListFragmentInteractionListener {
+        // TODO: Update argument type and name
+        void onListFragmentInteraction(Personne personne);
+        void onListFragmentInteractionLong(Personne personne);
+    }
+}
@@ -0,0 +1,21 @@
+package net.plil.clubinfo.etunicorn.data;
+
+import java.io.Serializable;
+
+/**
+ * Created by badetitou on 04/02/2017.
+ */
+public class Permission implements Serializable {
+    private String nom;
+
+    public Permission() {
+    }
+
+    public String getNom() {
+        return nom;
+    }
+
+    public void setNom(String nom) {
+        this.nom = nom;
+    }
+}
@@ -0,0 +1,32 @@
+package net.plil.clubinfo.etunicorn.data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by badetitou on 04/02/2017.
+ */
+public class Role implements Serializable{
+    private List<Permission> permissions = new ArrayList<>();
+    private String name;
+
+    public Role() {
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<Permission> getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(List<Permission> permissions) {
+        this.permissions = permissions;
+    }
+}
@@ -12,7 +12,7 @@ import com.android.volley.toolbox.Volley;
 public class VolleyUtils {
-    private static final String uri = "http://192.168.0.21:8080/";
+    private static final String uri = "http://blablapatate";
     private static final String version = "v1";
     public static final String baseUri = VolleyUtils.uri + VolleyUtils.version ;
@@ -35,6 +35,7 @@
         android:id="@+id/consomation_options"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:paddingRight="@dimen/activity_horizontal_margin"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="net.plil.clubinfo.etunicorn.app.Crediter">
+    tools:context="net.plil.clubinfo.etunicorn.app.credit.Crediter">
     <EditText
         android:inputType="numberSigned|numberDecimal"
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="net.plil.clubinfo.etunicorn.app.Debiter">
+    tools:context="net.plil.clubinfo.etunicorn.app.debit.Debiter">
     <EditText
@@ -26,6 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
+        android:paddingRight="@dimen/activity_horizontal_margin"
         android:layout_alignParentTop="true"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:text="&#8942;"
@@ -8,7 +8,7 @@ android:layout_height=&quot;match_parent&quot;&gt;
 <android.support.v7.widget.RecyclerView
     android:id="@+id/event_list"
-    android:name="net.plil.clubinfo.etunicorn.app.Event.EventFragment"
+    android:name="net.plil.clubinfo.etunicorn.app.event.EventFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginLeft="16dp"