Skip to content

C
Carrefour
Commit 903eb51d by Jemsheer K D
Options

Final Bug Fixes

parent 21fcf3e3
Showing with 48 additions and 26 deletions
.idea/misc.xml
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
app/src/main/java/in/techware/carrefour/activity/FileTransferActivity.java
...@@ -1435,9 +1435,10 @@ public class FileTransferActivity extends BaseAppCompatNoDrawerActivity { ...@@ -1435,9 +1435,10 @@ public class FileTransferActivity extends BaseAppCompatNoDrawerActivity {
while (iterator.hasNext()) { while (iterator.hasNext()) {
Map.Entry<String, ArrayList<PrintLabelBean>> entry = iterator.next(); Map.Entry<String, ArrayList<PrintLabelBean>> entry = iterator.next();
ArrayList<PrintLabelBean> list = entry.getValue();
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
for (PrintLabelBean bean : printLabelList) { for (PrintLabelBean bean : list) {
if (printLabelList.indexOf(bean) != 0) { if (list.indexOf(bean) != 0) {
stringBuilder.append("\n"); stringBuilder.append("\n");
} }
stringBuilder.append("ET") stringBuilder.append("ET")
...@@ -1446,7 +1447,7 @@ public class FileTransferActivity extends BaseAppCompatNoDrawerActivity { ...@@ -1446,7 +1447,7 @@ public class FileTransferActivity extends BaseAppCompatNoDrawerActivity {
.append("02"); .append("02");
} }
viewModel.setPrintLabelList(printLabelList); // viewModel.setPrintLabelList(printLabelList);
Log.i(TAG, "onAllUnsentListLoaded: PRINT LABEL : " + stringBuilder.toString()); Log.i(TAG, "onAllUnsentListLoaded: PRINT LABEL : " + stringBuilder.toString());
String tempFileName = entry.getKey().equals("") ? fileName : /*fileName +*/ entry.getKey(); String tempFileName = entry.getKey().equals("") ? fileName : /*fileName +*/ entry.getKey();
fop.writeFile(stringBuilder.toString(), tempFileName); fop.writeFile(stringBuilder.toString(), tempFileName);
...@@ -2406,6 +2407,9 @@ public class FileTransferActivity extends BaseAppCompatNoDrawerActivity { ...@@ -2406,6 +2407,9 @@ public class FileTransferActivity extends BaseAppCompatNoDrawerActivity {
labelType = AppConstants.PRODUCT_INFO_PAGE_WEEK_MOVEMENT; labelType = AppConstants.PRODUCT_INFO_PAGE_WEEK_MOVEMENT;
uploadFile(fileName, ""); uploadFile(fileName, "");
}else{
setProgressScreenVisibility(false, false);
finishTask(AppConstants.FILE_TRANSFER_RESULT_SEND_DATA_COMPLETED);
} }
} }
......
app/src/main/java/in/techware/carrefour/activity/info/LabelRequestActivity.java
...@@ -457,13 +457,7 @@ public class LabelRequestActivity extends BaseAppCompatNoDrawerActivity { ...@@ -457,13 +457,7 @@ public class LabelRequestActivity extends BaseAppCompatNoDrawerActivity {
txtDescription.setText(viewModel.getProductInfoBean().getItemDescription()); txtDescription.setText(viewModel.getProductInfoBean().getItemDescription());
if (viewModel.getLastEntry() != null) { setLastEntry();
txtLastEntryBarcode.setText(viewModel.getLastEntry().getBarcode());
txtLastEntryQuantity.setText(BarcodeUtil.removeTrailingZeroes(viewModel.getLastEntry().getNoOfLabels()));
} else {
txtLastEntryBarcode.setText("");
txtLastEntryQuantity.setText("");
}
if (viewModel.getPrinterBean() != null) { if (viewModel.getPrinterBean() != null) {
llSelectPrinter.setEnabled(false); llSelectPrinter.setEnabled(false);
...@@ -482,6 +476,16 @@ public class LabelRequestActivity extends BaseAppCompatNoDrawerActivity { ...@@ -482,6 +476,16 @@ public class LabelRequestActivity extends BaseAppCompatNoDrawerActivity {
} }
} }
private void setLastEntry() {
if (viewModel.getLastEntry() != null) {
txtLastEntryBarcode.setText(viewModel.getLastEntry().getBarcode());
txtLastEntryQuantity.setText(BarcodeUtil.removeTrailingZeroes(viewModel.getLastEntry().getNoOfLabels()));
} else {
txtLastEntryBarcode.setText("");
txtLastEntryQuantity.setText("");
}
}
private void clearViews() { private void clearViews() {
txtToolbarLastUpdateDate.setText(""); txtToolbarLastUpdateDate.setText("");
txtDescription.setText(""); txtDescription.setText("");
...@@ -560,6 +564,7 @@ public class LabelRequestActivity extends BaseAppCompatNoDrawerActivity { ...@@ -560,6 +564,7 @@ public class LabelRequestActivity extends BaseAppCompatNoDrawerActivity {
viewModel.setLastEntry(labelRequestList.get(viewModel.lastLabelRequestIndex())); viewModel.setLastEntry(labelRequestList.get(viewModel.lastLabelRequestIndex()));
}*/ }*/
setData(); setData();
setLastEntry();
swipeView.setRefreshing(false); swipeView.setRefreshing(false);
setProgressScreenVisibility(false, false); setProgressScreenVisibility(false, false);
} }
......
app/src/main/java/in/techware/carrefour/activity/it/ITRestoreActivity.java
...@@ -271,6 +271,7 @@ public class ITRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -271,6 +271,7 @@ public class ITRestoreActivity extends BaseAppCompatNoDrawerActivity {
} }
} }
); );
selectPrintLabelTypeDialog.show();
} }
...@@ -1141,11 +1142,13 @@ public class ITRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -1141,11 +1142,13 @@ public class ITRestoreActivity extends BaseAppCompatNoDrawerActivity {
viewModel.getPrintLabelMap().entrySet().iterator(); viewModel.getPrintLabelMap().entrySet().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
setProgressScreenVisibility(true, true);
Map.Entry<String, ArrayList<PrintLabelBean>> entry = iterator.next(); Map.Entry<String, ArrayList<PrintLabelBean>> entry = iterator.next();
ArrayList<PrintLabelBean> list = entry.getValue();
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
for (PrintLabelBean bean : printLabelList) { for (PrintLabelBean bean : list) {
if (printLabelList.indexOf(bean) != 0) { if (list.indexOf(bean) != 0) {
stringBuilder.append("\n"); stringBuilder.append("\n");
} }
stringBuilder.append("ET") stringBuilder.append("ET")
...@@ -1154,7 +1157,7 @@ public class ITRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -1154,7 +1157,7 @@ public class ITRestoreActivity extends BaseAppCompatNoDrawerActivity {
.append("02"); .append("02");
} }
viewModel.setPrintLabelList(printLabelList); // viewModel.setPrintLabelList(printLabelList);
String fileName = ITRestoreMenuUtil.getFileName(selectedSubMenuBean, labelType); String fileName = ITRestoreMenuUtil.getFileName(selectedSubMenuBean, labelType);
String tempFileName = entry.getKey().equals("") ? fileName : /*fileName + */entry.getKey(); String tempFileName = entry.getKey().equals("") ? fileName : /*fileName + */entry.getKey();
fop.writeFile(stringBuilder.toString(), tempFileName); fop.writeFile(stringBuilder.toString(), tempFileName);
......
app/src/main/java/in/techware/carrefour/activity/receive/ReceiveRestoreActivity.java
...@@ -12,7 +12,6 @@ import java.util.ArrayList; ...@@ -12,7 +12,6 @@ import java.util.ArrayList;
import in.techware.carrefour.R; import in.techware.carrefour.R;
import in.techware.carrefour.activity.BaseAppCompatNoDrawerActivity; import in.techware.carrefour.activity.BaseAppCompatNoDrawerActivity;
import in.techware.carrefour.activity.it.ITRestoreActivity;
import in.techware.carrefour.adapters.MenuListRecyclerAdapter; import in.techware.carrefour.adapters.MenuListRecyclerAdapter;
import in.techware.carrefour.config.Config; import in.techware.carrefour.config.Config;
import in.techware.carrefour.dbUtils.repositories.CompetitionRepository; import in.techware.carrefour.dbUtils.repositories.CompetitionRepository;
...@@ -208,7 +207,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -208,7 +207,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity {
String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0); String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0);
fop.writeFile(stringBuilder.toString(), fileName); fop.writeFile(stringBuilder.toString(), fileName);
uploadFile(fileName, ""); uploadFile(fileName, "");
}else{ } else {
if (!isFinishing()) { if (!isFinishing()) {
new PopupMessage(ReceiveRestoreActivity.this) new PopupMessage(ReceiveRestoreActivity.this)
.show(getString(R.string.message_restore_file_not_found), 0); .show(getString(R.string.message_restore_file_not_found), 0);
...@@ -285,7 +284,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -285,7 +284,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity {
fop.writeFile(stringBuilder.toString(), fileName); fop.writeFile(stringBuilder.toString(), fileName);
uploadFile(fileName, ""); uploadFile(fileName, "");
}else{ } else {
if (!isFinishing()) { if (!isFinishing()) {
new PopupMessage(ReceiveRestoreActivity.this) new PopupMessage(ReceiveRestoreActivity.this)
.show(getString(R.string.message_restore_file_not_found), 0); .show(getString(R.string.message_restore_file_not_found), 0);
...@@ -364,7 +363,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -364,7 +363,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity {
fop.writeFile(stringBuilder.toString(), fileName); fop.writeFile(stringBuilder.toString(), fileName);
uploadFile(fileName, ""); uploadFile(fileName, "");
}else{ } else {
if (!isFinishing()) { if (!isFinishing()) {
new PopupMessage(ReceiveRestoreActivity.this) new PopupMessage(ReceiveRestoreActivity.this)
.show(getString(R.string.message_restore_file_not_found), 0); .show(getString(R.string.message_restore_file_not_found), 0);
...@@ -440,7 +439,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -440,7 +439,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity {
String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0); String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0);
fop.writeFile(stringBuilder.toString(), fileName); fop.writeFile(stringBuilder.toString(), fileName);
uploadFile(fileName, ""); uploadFile(fileName, "");
}else{ } else {
if (!isFinishing()) { if (!isFinishing()) {
new PopupMessage(ReceiveRestoreActivity.this) new PopupMessage(ReceiveRestoreActivity.this)
.show(getString(R.string.message_restore_file_not_found), 0); .show(getString(R.string.message_restore_file_not_found), 0);
...@@ -514,7 +513,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -514,7 +513,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity {
String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0); String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0);
fop.writeFile(stringBuilder.toString(), fileName); fop.writeFile(stringBuilder.toString(), fileName);
uploadFile(fileName, ""); uploadFile(fileName, "");
}else{ } else {
if (!isFinishing()) { if (!isFinishing()) {
new PopupMessage(ReceiveRestoreActivity.this) new PopupMessage(ReceiveRestoreActivity.this)
.show(getString(R.string.message_restore_file_not_found), 0); .show(getString(R.string.message_restore_file_not_found), 0);
...@@ -586,7 +585,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -586,7 +585,7 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity {
String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0); String fileName = ReceiveRestoreMenuUtil.getFileName(selectedSubMenuBean, 0);
fop.writeFile(stringBuilder.toString(), fileName); fop.writeFile(stringBuilder.toString(), fileName);
uploadFile(fileName, ""); uploadFile(fileName, "");
}else{ } else {
if (!isFinishing()) { if (!isFinishing()) {
new PopupMessage(ReceiveRestoreActivity.this) new PopupMessage(ReceiveRestoreActivity.this)
.show(getString(R.string.message_restore_file_not_found), 0); .show(getString(R.string.message_restore_file_not_found), 0);
...@@ -663,8 +662,10 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity { ...@@ -663,8 +662,10 @@ public class ReceiveRestoreActivity extends BaseAppCompatNoDrawerActivity {
} }
private void finishTask() { private void finishTask() {
if (!isFinishing()) {
new PopupMessage(ReceiveRestoreActivity.this) new PopupMessage(ReceiveRestoreActivity.this)
.show(getString(R.string.message_file_sent_successfully), 5000); .show(getString(R.string.message_file_sent_successfully), 5000);
}
new Handler().postDelayed(new Runnable() { new Handler().postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
......
app/src/main/java/in/techware/carrefour/util/menuUtils/ReceiveRestoreMenuUtil.java
...@@ -53,11 +53,20 @@ public class ReceiveRestoreMenuUtil { ...@@ -53,11 +53,20 @@ public class ReceiveRestoreMenuUtil {
public static String getFileName(MenuBean menuBean, int type) { public static String getFileName(MenuBean menuBean, int type) {
switch (menuBean.getCode()) { switch (menuBean.getCode()) {
case ELIERestoreMenuUtil.CODE_EXPIRY_CAPTURE: case ReceiveRestoreMenuUtil.CODE_RECEIVING:
return Config.getInstance().getAppSettingsBean().getItemExpiryFilePrefix(); return Config.getInstance().getAppSettingsBean().getReceivingFilePrefix();
case ELIERestoreMenuUtil.CODE_EXPIRED_ACTION: case ReceiveRestoreMenuUtil.CODE_RETURN:
return Config.getInstance().getAppSettingsBean().getExpiredActionFilePrefix(); return Config.getInstance().getAppSettingsBean().getReturnFilePrefix();
case ELIERestoreMenuUtil.CODE_EXIT: case ReceiveRestoreMenuUtil.CODE_PRICE_SURVEY:
return Config.getInstance().getAppSettingsBean().getPricingFilePrefix();
case ReceiveRestoreMenuUtil.CODE_STORE_TO_OFFSITE:
return Config.getInstance().getAppSettingsBean().getTransStorToOffsiteFilePrefix();
case ReceiveRestoreMenuUtil.CODE_OFFSITE_TO_STORE:
return Config.getInstance().getAppSettingsBean().getTransOffsiteToStoreFilePrefix();
case ReceiveRestoreMenuUtil.CODE_COMPETITION:
return Config.getInstance().getAppSettingsBean().getCompetitionFilePrefix();
case ReceiveRestoreMenuUtil.CODE_RESTORE:
case ReceiveRestoreMenuUtil.CODE_EXIT:
default: default:
return ""; return "";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment