Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Piccole modifiche

Browse Source
This commit is contained in:
Giuseppe Scorrano 2018-10-22 08:50:54 +02:00
parent 3a8e475f72
commit 8476fa4508
11 changed files with 104 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.idea/assetWizardSettings.xml generated
View File

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WizardSettings">
<option name="children">
<map>
<entry key="vectorWizard">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="vectorAssetStep">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipartAsset">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/navigation/ic_close_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
<option name="values">
<map>
<entry key="color" value="ffffff" />
<entry key="outputName" value="ic_close_new_24dp" />
<entry key="overrideSize" value="true" />
<entry key="sourceFile" value="C:\Users\GiuseppeS" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</component>
</project>

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

22
.idea/compiler.xml generated
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>

3
.idea/copyright/profiles_settings.xml generated
View File

@ -1,3 +0,0 @@
<component name="CopyrightManager">
<settings default="" />
</component>

3
.idea/gradle.xml generated
View File

@ -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="C:\Program Files\Android\Android Studio\gradle\gradle-4.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

8
.idea/kotlinc.xml generated
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinCommonCompilerArguments">
<option name="errors">
<ArgumentParseErrors />
</option>
</component>
</project>

15
.idea/misc.xml generated
View File

@ -5,26 +5,31 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<list size="7">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
.idea/vcs.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="" vcs="Git" />
</component>
</project>

18
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
View File

@ -20,6 +20,7 @@ import android.view.ViewGroup;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import butterknife.BindView;
@ -248,7 +249,9 @@ public class MainAccettazioneFragment extends Fragment implements ICheckBoxCallb
public void onLoadSuccess(final List<OrdineAccettazioneDTO> ordini) {
progress.dismiss();
int artsCounter = ordini.size();
Arrays.stream(ordini).
int artsCounter = Coollection.from(ordini).where("qtaDaEvadere", Coollection.greaterThan(0)).all().size();
List<String> ordersKeys = new ArrayList<>();
for(OrdineAccettazioneDTO ordine : ordini){
@ -263,16 +266,13 @@ public class MainAccettazioneFragment extends Fragment implements ICheckBoxCallb
+ "<br /><br />" +
"<b>" + artsCounter + "</b> " + getActivity().getResources().getQuantityString(R.plurals.available_articles, artsCounter)),
null,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
(dialogInterface, i) -> {
Intent myIntent = new Intent(getActivity(), AccettazioneOrdineInevasoActivity.class);
myIntent.putExtra("key", (ArrayList<OrdineAccettazioneDTO>) ordini); //Optional parameters
getActivity().startActivity(myIntent);
Intent myIntent = new Intent(getActivity(), AccettazioneOrdineInevasoActivity.class);
myIntent.putExtra("key", (ArrayList<OrdineAccettazioneDTO>) ordini); //Optional parameters
getActivity().startActivity(myIntent);
}
}).show();
}).show();
}

20
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java
View File

@ -116,25 +116,19 @@ public class MainListAccettazioneAdapter extends RecyclerView.Adapter<MainListAc
if (i % 2 == 1) {
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
} else {
groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.white));
}
final CheckBox checkBox = groupModelView.findViewById(R.id.accettazione_main_list_group_item_container_checkBox);
checkBox.setChecked(ordine.checkBox);
ordine.checkBoxCallback.add(new ICheckBoxCallback() {
@Override
public void onToggle(boolean newValue) {
checkBox.setChecked(newValue);
}
});
ordine.checkBoxCallback.add(checkBox::setChecked);
groupModelView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkBox.toggle();
ordine.checkBox = checkBox.isChecked();
mCheckBoxCallback.onToggle(checkBox.isChecked());
}
groupModelView.setOnClickListener(view -> {
checkBox.toggle();
ordine.checkBox = checkBox.isChecked();
mCheckBoxCallback.onToggle(checkBox.isChecked());
});
TextView testataOrdTextView = groupModelView.findViewById(R.id.accettazione_main_list_group_item_container_testata_ord);

77
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java
View File

@ -34,6 +34,8 @@ public class OrdineAccettazioneDTO implements Parcelable {
public static class Riga implements Parcelable {
public Float qtaOrd;
public Float qtaRiservate;
public Float qtaEvasa;
public Float qtaDaEvadere;
public int rigaOrd;
public String codJcom;
public String ragSocCom;
@ -52,8 +54,81 @@ public class OrdineAccettazioneDTO implements Parcelable {
public String dataCons;
//public Float getQtaDaEvadere() {
// return this.qtaOrd - this.qtaRiservate;
//}
public Float getQtaOrd() {
return qtaOrd;
}
public Float getQtaRiservate() {
return qtaRiservate;
}
public Float getQtaEvasa() {
return qtaEvasa;
}
public Float getQtaDaEvadere() {
return this.qtaOrd - this.qtaRiservate;
return qtaDaEvadere;
}
public int getRigaOrd() {
return rigaOrd;
}
public String getCodJcom() {
return codJcom;
}
public String getRagSocCom() {
return ragSocCom;
}
public String getDescrizioneCommessa() {
return descrizioneCommessa;
}
public MtbAart getMtbAart() {
return mtbAart;
}
public PickingObjectDTO[] getColliAssociati() {
return colliAssociati;
}
public boolean isHidden() {
return hidden;
}
public String getPartitaMag() {
return partitaMag;
}
public String getCodArtFor() {
return codArtFor;
}
public String getDescrizioneEstesa() {
return descrizioneEstesa;
}
public String getCodAlis() {
return codAlis;
}
public int getNumOrd() {
return numOrd;
}
public String getGestioneOrd() {
return gestioneOrd;
}
public String getDataCons() {
return dataCons;
}
public Date getDataOrd() {