diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/MyEventRecyclerViewAdapter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/MyEventRecyclerViewAdapter.java index e39106b..2f7fc09 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/MyEventRecyclerViewAdapter.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/Event/MyEventRecyclerViewAdapter.java @@ -40,7 +40,7 @@ public class MyEventRecyclerViewAdapter extends RecyclerView.Adapter() { + jsonObjectRequest = new JsonObjectRequest(Request.Method.POST, VolleyUtils.baseUri + "/login" , new JSONObject(JsonConverter.getConverter().toJson(user)), new Response.Listener() { @Override public void onResponse(JSONObject response) { showProgress(false); Intent intent = new Intent(getApplicationContext(), MainActivity.class); - Session s = JsonCoverter.getConverter().fromJson(String.valueOf(response), Session.class); + Session s = JsonConverter.getConverter().fromJson(String.valueOf(response), Session.class); intent.putExtra("session", s); startActivity(intent); } @@ -196,7 +166,10 @@ public class LoginActivity extends AppCompatActivity { @Override public void onErrorResponse(VolleyError error) { showProgress(false); - Toast.makeText(getApplicationContext(), "error : " + ConvertBytesToString.bytesToStringVolLey(error.networkResponse.data), Toast.LENGTH_SHORT).show(); + if (error.networkResponse != null) + Toast.makeText(getApplicationContext(), "error : " + ConvertBytesToString.bytesToStringVolLey(error.networkResponse.data), Toast.LENGTH_SHORT).show(); + else + Toast.makeText(getApplicationContext(), "Unknow Error " + error.getMessage(), Toast.LENGTH_SHORT).show(); } } ); diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java index 199210f..8c5d20d 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/MainActivity.java @@ -59,7 +59,7 @@ public class MainActivity extends AppCompatActivity private Toolbar toolbar; private AppBarLayout appBarLayout; - private Session s; + public static Session session; NfcAdapter mAdapter; PendingIntent mPendingIntent; @@ -69,18 +69,18 @@ public class MainActivity extends AppCompatActivity super.onCreate(savedInstanceState); Intent intent = this.getIntent(); - s = (Session) intent.getSerializableExtra("session"); - if (s.getPersonne().getRole().getNom().equals("admin")){ + session = (Session) intent.getSerializableExtra("session"); + if (session.getPersonne().getRole().getNom().equals("admin")){ nbPages = 5; Action.CONSOMATION.setValue(2); Action.EVENT.setValue(3); Action.PERSONNE.setValue(4); - } else if (s.getPersonne().getRole().getNom().equals("bde")){ + } else if (session.getPersonne().getRole().getNom().equals("bde")){ nbPages = 4; Action.CONSOMATION.setValue(-1); Action.EVENT.setValue(2); Action.PERSONNE.setValue(3); - } else if (s.getPersonne().getRole().getNom().equals("bar")){ + } else if (session.getPersonne().getRole().getNom().equals("bar")){ nbPages = 3; Action.CONSOMATION.setValue(2); Action.EVENT.setValue(-1); diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ConsommationRecyclerViewAdapter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ConsommationRecyclerViewAdapter.java index bdc3802..dc1edff 100644 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ConsommationRecyclerViewAdapter.java +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/app/consommation/ConsommationRecyclerViewAdapter.java @@ -42,9 +42,9 @@ public class ConsommationRecyclerViewAdapter extends RecyclerView.Adapter() { + JsonArrayRequest jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, VolleyUtils.baseUri + "/role" ,null , new Response.Listener() { @Override - public void onResponse(JSONObject response) { - JSONArray jsonArray = null; + public void onResponse(JSONArray response) { try { - //TODO change this by the real name of the array - jsonArray = response.getJSONArray("roles"); arraySpinnerRole.clear(); - for (int i =0; i getHeaders() throws AuthFailureError { + Map headers = new HashMap(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + }}; jsonObjectRequest.setTag(ModifyPersonne.class); + + try { + for (String s : jsonObjectRequest.getHeaders().keySet()){ + System.out.println(s + " " + jsonObjectRequest.getHeaders().get(s)); + } + } catch (AuthFailureError authFailureError) { + authFailureError.printStackTrace(); + } + System.out.println(ConvertBytesToString.bytesToStringVolLey(jsonObjectRequest.getBody())); + VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonObjectRequest); } }); @@ -211,16 +244,13 @@ public class ModifyPersonne extends DialogFragment { } private void changeRolePossibility(){ - JsonObjectRequest jsonObjectRequest = new JsonObjectRequest(Request.Method.GET, VolleyUtils.baseUri + "/role/" ,null , new Response.Listener() { + JsonArrayRequest jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, VolleyUtils.baseUri + "/role" ,null , new Response.Listener() { @Override - public void onResponse(JSONObject response) { - JSONArray jsonArray = null; + public void onResponse(JSONArray response) { try { - //TODO change this by the real name of the array - jsonArray = response.getJSONArray("roles"); arraySpinnerRole.clear(); - for (int i =0; i personnes = new ArrayList<>(); + private RecyclerView.Adapter mAdapter; /** * Mandatory empty constructor for the fragment manager to instantiate the @@ -54,27 +68,9 @@ public class PersonneFragment extends FragmentNFC { Context context = view.getContext(); RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.personne_list); recyclerView.setLayoutManager(new LinearLayoutManager(context)); - - List personneList = new ArrayList<>(); - Role r = new Role(); - r.setNom("ADMIN_TEST"); - Permission p = new Permission(); - p.setNom("Lire"); - r.getPermissions().add(p); - p = new Permission(); - p.setNom("Ecrire"); - r.getPermissions().add(p); - for (int i = 0;i<150;++i){ - Personne personne = new Personne(); - personne.setCarte("15245698547856"); - personne.setLogin("bverhaeg"); - personne.setNaissance(new Date(System.currentTimeMillis())); - personne.setSolde(45); - personne.setRole(r); - personneList.add(personne); - } - recyclerView.setAdapter(new MyPersonneRecyclerViewAdapter(personneList, mListener, getActivity())); - + mAdapter = new MyPersonneRecyclerViewAdapter(personnes, mListener, getActivity()); + recyclerView.setAdapter(mAdapter); + setPersonnes(); FloatingActionButton fAB = (FloatingActionButton) view.findViewById(R.id.personne_add); fAB.setOnClickListener(new View.OnClickListener() { @Override @@ -105,6 +101,39 @@ public class PersonneFragment extends FragmentNFC { mListener = null; } + private void setPersonnes(){ + JsonArrayRequest jsonArrayRequest = new JsonArrayRequest(Request.Method.GET, VolleyUtils.baseUri + "/personne" ,null , new Response.Listener() { + @Override + public void onResponse(JSONArray response) { + try { + personnes.clear(); + for (int i =0; i getHeaders() throws AuthFailureError { + Map headers = new HashMap<>(); + headers.put("Authorization", MainActivity.session.getToken()); + return headers; + } + }; + jsonArrayRequest.setTag(ModifyPersonne.class); + VolleyUtils.getInstance(getContext()).addToRequestQueue(jsonArrayRequest); + } + @Override public void processNFC(String idCardUser) { diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/utils/JsonConverter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/utils/JsonConverter.java new file mode 100644 index 0000000..cf7ca78 --- /dev/null +++ b/app/src/main/java/net/plil/clubinfo/etunicorn/utils/JsonConverter.java @@ -0,0 +1,35 @@ +package net.plil.clubinfo.etunicorn.utils; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParser; + +import org.json.JSONException; +import org.json.JSONObject; + +/** + * Created by badetitou on 05/02/2017. + */ + +public class JsonConverter { + + private static Gson gson; + + public static Gson getConverter(){ + if (gson != null) + return gson; + + gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create(); + return gson; + } + + public static JSONObject convertToJSONObject(Object selectedItem) { + JSONObject jsonObject = null; + try { + jsonObject = new JSONObject(getConverter().toJson(selectedItem)); + } catch (JSONException e) { + e.printStackTrace(); + } + return jsonObject; + } +} diff --git a/app/src/main/java/net/plil/clubinfo/etunicorn/utils/JsonCoverter.java b/app/src/main/java/net/plil/clubinfo/etunicorn/utils/JsonCoverter.java deleted file mode 100644 index 343ed1b..0000000 --- a/app/src/main/java/net/plil/clubinfo/etunicorn/utils/JsonCoverter.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.plil.clubinfo.etunicorn.utils; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -/** - * Created by badetitou on 05/02/2017. - */ - -public class JsonCoverter { - - private static Gson gson; - - public static Gson getConverter(){ - if (gson != null) - return gson; - - gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create(); - return gson; - } -} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index c3d65a9..d2ec234 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -38,9 +38,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/prompt_username" - android:inputType="none" android:maxLines="1" - android:singleLine="true" /> + android:singleLine="true" + android:inputType="textNoSuggestions" /> diff --git a/app/src/main/res/layout/fragment_modify_personne.xml b/app/src/main/res/layout/fragment_modify_personne.xml index 8a4b218..58b63c6 100644 --- a/app/src/main/res/layout/fragment_modify_personne.xml +++ b/app/src/main/res/layout/fragment_modify_personne.xml @@ -41,7 +41,7 @@ style="?android:attr/progressBarStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/modify_consommation_progress_bar" + android:id="@+id/modify_personne_progress_bar" android:layout_gravity="center" android:visibility="gone"/> -- libgit2 0.21.2