Skip to content

Commit

Permalink
TODO Comparer les dates pour avoir des différences négatives
Browse files Browse the repository at this point in the history
  • Loading branch information
@nimrodfmc
nimrodfmc committed Feb 20, 2019
1 parent 85f6677 commit 538908d
Showing 1 changed file with 71 additions and 20 deletions.
91 changes: 71 additions & 20 deletions app/src/main/java/com/example/maximeglod/fbta/Evolution.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -102,17 +104,23 @@ 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<Entry> yValues = new ArrayList<>();
Integer result = poidsMap.get("18/02/2019");
//Implémentation fonction différence date

//////////
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;
Expand All @@ -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
Expand All @@ -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<ILineDataSet> 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
Expand All @@ -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<ILineDataSet> 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<ILineDataSet> 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<ILineDataSet> 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<ILineDataSet> 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));
Expand Down

0 comments on commit 538908d

Please sign in to comment.