From 801d9e10495820d77c942f26e10a2b52ca9ff23b Mon Sep 17 00:00:00 2001
From: Jacques Foucry <jacques@foucry.net>
Date: Mon, 23 May 2016 22:32:14 +0200
Subject: [PATCH] Modification calcul de la couleur du fond de la cellule

---
 .idea/gradle.xml                                           | 3 +--
 .../java/net/foucry/pilldroid/MedicamentListActivity.java  | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 58992cc..508b3d9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java b/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
index f438c5f..5d357fc 100644
--- a/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
@@ -183,11 +183,12 @@ public class MedicamentListActivity extends AppCompatActivity {
             if (mValues.get(position).getPrise() == 0) {
                 holder.mView.setBackgroundResource(R.drawable.gradient_bg);
             } else {
-                if (mValues.get(position).getStock() <= mValues.get(position).getAlertThreshold()) {
+                int remainingStock = (int) Math.floor(mValues.get(position).getStock()/mValues.get(position).getPrise());
+                if (remainingStock <= mValues.get(position).getAlertThreshold()) {
                     holder.mView.setBackgroundResource(R.drawable.gradient_bg_alert);
                     holder.mIconView.setImageResource(R.drawable.stock_alert);
-                } else if ((mValues.get(position).getStock() > mValues.get(position).getAlertThreshold()) &&
-                        (mValues.get(position).getStock() <= (mValues.get(position).getWarnThreshold() * mValues.get(position).getPrise()))) {
+                } else if ((remainingStock > mValues.get(position).getAlertThreshold()) &&
+                        (remainingStock <= (mValues.get(position).getWarnThreshold()))) {
                     holder.mView.setBackgroundResource(R.drawable.gradient_bg_warning);
                     holder.mIconView.setImageResource(R.drawable.stock_warn);
                 } else {