WebSVN – SmartDukaan – Diff – /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java

         Button addButton = new Button("Add");
         headerVendorM.setWidget(0, TABLE_INDEX_ITEM_KEY + 1, addButton);
         addButton.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
-                VendorMappingDialog vendorMappingDialog = new VendorMappingDialog();
+                VendorMappingDialog vendorMappingDialog = new VendorMappingDialog(productGroup.getText().trim(), brand.getText().trim(),
+                        modelNumber.getText().trim(), color.getText().trim());
                 vendorMappingDialog.updateButton.setText("Add");
                 vendorMappingDialog.setVendorMappingUpdateListener(new VendorMappingDialog.VendorMappingUpdateListener() {
                     @Override
                     public boolean onUpdate(String key, long vendorId) {
                         final int row = vendorTableM.getRowCount();
      * On add button click a new item instance is created and all the information from UI fields is dumped in this item instance.
      * This item instance is then passed to service implementation.
      */
     void addItem(ClickEvent event) {
         //TODO: validate UI fields
         catalogService.checkSimilarItem(productGroup.getText().trim(), brand.getText().trim(),
                 modelNumber.getText().trim(), color.getText().trim(), new AsyncCallback<Long>() {
             @Override
             public void onFailure(Throwable caught) {
                 GWT.log("Error checking similar item");
                 addNewItem();
+            }
         });
+    }
-    void addNewItem() {
+    private void addNewItem() {
         Item item = new Item();
         item.setProductGroup(productGroup.getText().trim());
         item.setVendorCategory(vendorCategory.getItemText(vendorCategory.getSelectedIndex()));
         item.setModelNumber(modelNumber.getText().trim());
         item.setModelName(modelName.getText().trim());
         item.setColor(color.getText().trim());
         item.setComments(comments.getText().trim());
         try {
+            if(!mrp.getText().trim().isEmpty()) {
-            double mrpValue = Double.parseDouble(mrp.getText().trim());
+                double mrpValue = Double.parseDouble(mrp.getText().trim());
-            if(mrpValue < 0) {
+                if(mrpValue <= 0) {
-                throw new NumberFormatException("Negative value of MRP");
+                    throw new NumberFormatException("Negative value of MRP");
+                }
+                item.setMrp(mrpValue);
+            } else {
+                item.setMrp(-1);
+            }
-            item.setMrp(mrpValue);
         } catch(NumberFormatException ex) {
-            Window.alert("Invalid MRP format");
+            Window.alert("Invalid MRP format/value. Value shoule be greater than zero");
             return;
+        }
         try {
+            if(!sellingPrice.getText().trim().isEmpty()) {
             double spValue = Double.parseDouble(sellingPrice.getText().trim());
-            if(spValue < 0) {
+            if(spValue <= 0) {
                 throw new NumberFormatException("Negative value of Selling price");
+            }
             item.setSellingPrice(spValue);
+            } else {
+                item.setSellingPrice(-1);
+            }
         } catch(NumberFormatException ex) {
-            Window.alert("Invalid Selling Price format");
+            Window.alert("Invalid Selling Price format/value. Value shoule be greater than zero");
             return;
+        }
         try {
-            if(!weight.getText().trim().equals("")) {
+            if(!weight.getText().trim().isEmpty()) {
                 double wtValue = Double.parseDouble(weight.getText().trim());
-                if(wtValue < 0) {
+                if(wtValue <= 0) {
                     throw new NumberFormatException("Negative value of Weight");
+                }
                 item.setWeight(wtValue);
+            } else {
+                item.setWeight(-1);
+            }
         } catch(NumberFormatException ex) {
-            Window.alert("Invalid weight format");
+            Window.alert("Invalid weight format/value. Value shoule be greater than zero");
             return;
+        }
         try {
             if(!startDate.getTextBox().getText().trim().equals("")) {
                 item.setStartDate(startDate.getValue().getTime());
+            }
         } catch(Exception ex) {
             Window.alert("Invalid start date format");
             return;
+        }
-        try {
-            if(!retireDate.getTextBox().getText().trim().equals("")) {
-                item.setRetireDate(retireDate.getValue().getTime());
-            }
-        } catch(Exception ex) {
-            Window.alert("Invalid retire date format");
-            return;
-        }
         item.setBestDealsText(bestDealText.getText().trim());
         try {
             if(!bestDealValue.getText().trim().equals("")) {
                 double bdValue = Double.parseDouble(bestDealValue.getText().trim());
                 if(bdValue < 0) {
                     throw new NumberFormatException("Negative value of BestDealValue");
+                }
                 item.setBestDealsValue(bdValue);
+            } else {
+                item.setBestDealsValue(-1);
+            }
         } catch(NumberFormatException ex) {
             Window.alert("Invalid best deal value format");
             return;
+        }
                 long bsrValue = Long.parseLong(bestSellingRank.getText().trim());
                 if(bsrValue < 0) {
                     throw new NumberFormatException("Negative value of Best Selling Rank");
+                }
                 item.setBestSellingRank(bsrValue);
+            } else {
+                item.setBestSellingRank(-1);
+            }
         } catch(NumberFormatException ex) {
             Window.alert("Invalid best selling rank format");
             return;

Subversion Repositories SmartDukaan

(root)/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java – Rev 2119 → 2126