#53 idem previous commit

ekylibre · Dec 20, 2017 · 342db7a · 342db7a
1 parent fb91d9b
commit 342db7a
Showing 1 changed file with 32 additions and 5 deletions.
diff --git a/app/src/main/java/ekylibre/zero/reception/ArticleNewActivity.java b/app/src/main/java/ekylibre/zero/reception/ArticleNewActivity.java
@@ -13,20 +13,22 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
+import android.widget.Toast;
 
 import ekylibre.database.ZeroContract;
 import ekylibre.zero.R;
 
 
 public class ArticleNewActivity extends AppCompatActivity implements View.OnClickListener {
 
-    String[] natureList = {"Fertilizer", "Seed", "Chemical"};
-    String[] unityList = {"kg", "L", "t"};
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+
+        String[] natureList = {getResources().getString(R.string.spinner_selection_nature), getResources().getString(R.string.fertilizer), getResources().getString(R.string.seed), getResources().getString(R.string.chemical)};
+        String[] unityList = {getResources().getString(R.string.spinner_selection_unity), "kg", "L", "t"};
+
         setContentView(R.layout.article_new);
 
         Button btn_save = (Button) findViewById(R.id.buttonSaveArticleId);
@@ -55,15 +57,40 @@ public void add_article(Context context) {
         mNewValues.put(ZeroContract.Articles.NAME, newArticleName.getText().toString());
         mNewValues.put(ZeroContract.Articles.NATURE, SpinnerArticleNature.getSelectedItem().toString());
         mNewValues.put(ZeroContract.Articles.UNITY, SpinnerArticleUnity.getSelectedItem().toString());
+        mNewValues.put(ZeroContract.Articles.EK_ID, 1);
+
         contentResolver.insert(ZeroContract.Articles.CONTENT_URI, mNewValues);
     }
 
     @Override
     public void onClick(View _buttonView) {
-        //Récupère ce qu'a tapé l'utilisateur dans la zone de texte et la renvoie à la MainActivtity
         if (_buttonView.getId() == R.id.buttonSaveArticleId) {
-            add_article(this);
+            if (is_complete()) {
+                add_article(this);
+                Toast toast = Toast.makeText(getApplicationContext(), R.string.article_saved, Toast.LENGTH_SHORT);
+                toast.show();
+            }
+            else{
+                Toast toast = Toast.makeText(getApplicationContext(), R.string.article_cannot_save, Toast.LENGTH_SHORT);
+                toast.show();
 
+            }
+
+
+        }
+    }
+
+    private boolean is_complete() {
+        EditText newArticleName = (EditText) findViewById(R.id.editArticleNameId);
+
+        Spinner SpinnerArticleNature = (Spinner) findViewById(R.id.spinnerNatureArticleId);
+        Spinner SpinnerArticleUnity = (Spinner) findViewById(R.id.spinnerUnityArticleId);
+
+        if (SpinnerArticleNature.getSelectedItemPosition() == 0 || SpinnerArticleUnity.getSelectedItemPosition() == 0 ||  newArticleName.getText().toString().trim().equals("")){
+            return false;
+        }
+        else {
+            return true;
         }
     }
 }