From 538908db15e863c0b571de1086666d43d9504802 Mon Sep 17 00:00:00 2001 From: nimrodfmc Date: Wed, 20 Feb 2019 12:05:56 +0100 Subject: [PATCH] =?UTF-8?q?TODO=20Comparer=20les=20dates=20pour=20avoir=20?= =?UTF-8?q?des=20diff=C3=A9rences=20n=C3=A9gatives?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/maximeglod/fbta/Evolution.java | 91 +++++++++++++++---- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/example/maximeglod/fbta/Evolution.java b/app/src/main/java/com/example/maximeglod/fbta/Evolution.java index b414ed3..697d2fb 100644 --- a/app/src/main/java/com/example/maximeglod/fbta/Evolution.java +++ b/app/src/main/java/com/example/maximeglod/fbta/Evolution.java @@ -76,6 +76,8 @@ public void onCreate(Bundle savedInstanceState) { mChart.setPinchZoom(true); //Alternative color background mChart.setBackgroundColor(Color.BLACK); + + //Maintenant on travail sur les données //LineData data = new LineData(); // data.setValueTextColor(Color.WHITE); @@ -102,6 +104,8 @@ public void onCreate(Bundle savedInstanceState) { yl2.setEnabled(false); final List list_x_axis_name = new ArrayList<>(); + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); ArrayList yValues = new ArrayList<>(); Integer result = poidsMap.get("18/02/2019"); @@ -109,10 +113,14 @@ public void onCreate(Bundle savedInstanceState) { ////////// if (poidsMap != null) { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); //Boucle While + iterator Iterator iterator = poidsMap.entrySet().iterator(); Integer a = 0; while (iterator.hasNext()) { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); Map.Entry mapentry = (Map.Entry) iterator.next(); Object i = mapentry.getValue(); Integer i2 = (Integer) i; @@ -123,9 +131,13 @@ public void onCreate(Bundle savedInstanceState) { Calendar cal = Calendar.getInstance(); int ds = cal.get(Calendar.MONTH) + 1; if (cal.get(Calendar.DAY_OF_MONTH) < 10) { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); String corjour = "0"; if ((cal.get(Calendar.MONTH) + 1) < 10) { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); final String heures = (corjour + cal.get(Calendar.DAY_OF_MONTH) + "/" + corjour + ds + "/" + cal.get(Calendar.YEAR)); DateTimeFormatter format = DateTimeFormatter.ofPattern("dd/MM/yyyy"); // format jour / mois / année @@ -136,19 +148,22 @@ public void onCreate(Bundle savedInstanceState) { Period period = Period.between(date1, date2); Integer b = a + 1; + Integer getdays = period.getDays(); - - yValues.add(new Entry(period.getDays(), i2)); + yValues.add(new Entry(getdays, i2)); //yValues.add(new Entry(1,63)); LineDataSet set1 = new LineDataSet(yValues, "Evolution de votre poids"); ArrayList dataSets = new ArrayList<>(); dataSets.add(set1); LineData data2 = new LineData(dataSets); //LineData data3 = new LineDataSet(null,"Evolution du poids"); - + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); mChart.setData(data2); } else { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); final String heures = (corjour + cal.get(Calendar.DAY_OF_MONTH) + "/" + ds + "/" + cal.get(Calendar.YEAR)); DateTimeFormatter format = DateTimeFormatter.ofPattern("dd/MM/yyyy"); // format jour / mois / année @@ -159,43 +174,79 @@ public void onCreate(Bundle savedInstanceState) { Period period = Period.between(date1, date2); Integer b = a + 1; + Integer getdays = period.getDays(); - - yValues.add(new Entry(period.getDays(), i2)); + yValues.add(new Entry(getdays, i2)); //yValues.add(new Entry(1,63)); LineDataSet set1 = new LineDataSet(yValues, "Evolution de votre poids"); ArrayList dataSets = new ArrayList<>(); dataSets.add(set1); LineData data2 = new LineData(dataSets); //LineData data3 = new LineDataSet(null,"Evolution du poids"); - + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); mChart.setData(data2); } } else { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); + + if ((cal.get(Calendar.MONTH) + 1) < 10) { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); + final String heures = (cal.get(Calendar.DAY_OF_MONTH) + "/" + "0" + ds + "/" + cal.get(Calendar.YEAR)); + + DateTimeFormatter format = DateTimeFormatter.ofPattern("dd/MM/yyyy"); // format jour / mois / année - final String heures = (cal.get(Calendar.DAY_OF_MONTH) + "/" + ds + "/" + cal.get(Calendar.YEAR)); + LocalDate date1 = LocalDate.parse(dateduhashmap, format); + LocalDate date2 = LocalDate.parse(heures, format); + + Period period = Period.between(date1, date2); + + + Integer b = a + 1; + Integer getdays = period.getDays(); + + yValues.add(new Entry(getdays, i2)); + //yValues.add(new Entry(1,63)); + LineDataSet set1 = new LineDataSet(yValues, "Evolution de votre poids"); + ArrayList dataSets = new ArrayList<>(); + dataSets.add(set1); + LineData data2 = new LineData(dataSets); + //LineData data3 = new LineDataSet(null,"Evolution du poids"); + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); + mChart.setData(data2); - DateTimeFormatter format = DateTimeFormatter.ofPattern("dd/MM/yyyy"); // format jour / mois / année + } else { + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); + final String heures = (cal.get(Calendar.DAY_OF_MONTH) + "/" + ds + "/" + cal.get(Calendar.YEAR)); - LocalDate date1 = LocalDate.parse(dateduhashmap, format); - LocalDate date2 = LocalDate.parse(heures, format); + DateTimeFormatter format = DateTimeFormatter.ofPattern("dd/MM/yyyy"); // format jour / mois / année - Period period = Period.between(date1, date2); + LocalDate date1 = LocalDate.parse(dateduhashmap, format); + LocalDate date2 = LocalDate.parse(heures, format); - Integer b = a + 1; + Period period = Period.between(date1, date2); + Integer b = a + 1; + Integer getdays = period.getDays(); - yValues.add(new Entry(period.getDays(), i2)); - //yValues.add(new Entry(1,63)); - LineDataSet set1 = new LineDataSet(yValues, "Evolution de votre poids"); - ArrayList dataSets = new ArrayList<>(); - dataSets.add(set1); - LineData data2 = new LineData(dataSets); - //LineData data3 = new LineDataSet(null,"Evolution du poids"); + yValues.add(new Entry(getdays, i2)); + //yValues.add(new Entry(1,63)); + LineDataSet set1 = new LineDataSet(yValues, "Evolution de votre poids"); + ArrayList dataSets = new ArrayList<>(); + dataSets.add(set1); + LineData data2 = new LineData(dataSets); + //LineData data3 = new LineDataSet(null,"Evolution du poids"); + mChart.getAxisLeft().setStartAtZero(false); + mChart.getAxisRight().setStartAtZero(false); + mChart.setData(data2); - mChart.setData(data2); + } } //final String heures = (cal.get(Calendar.DAY_OF_MONTH) + "/" + ds + "/" + cal.get(Calendar.YEAR));