Skip to content

Samuel2 #12

Merged
merged 3 commits into from
Mar 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dependencies {
implementation 'me.riddhimanadib.form-master:form-master:1.1.0'
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.google.firebase:firebase-auth:19.4.0'
implementation 'com.github.addisonelliott:SegmentedButton:3.1.9'
implementation 'com.google.firebase:firebase-firestore:21.6.0'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ private void setupForm() {
String projectManager = projectManagerTextField.getValue();
String siteManager = siteManagerTextField.getValue();
String projectOwner = projectOwnerTextField.getValue();

answersList.add(projectManager);
answersList.add(siteManager);
answersList.add(projectOwner);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ public class WaterWayForm extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

setContentView(R.layout.activity_sample_fordm);
recyclerView = findViewById(R.id.recyclerView2);
setupHQForm();

}

private void setupHQForm() {
Expand Down Expand Up @@ -98,6 +100,7 @@ private void setupHQForm() {

formBuilder.addFormElements(formItems);


subVal = Double.parseDouble(subSize.getValue());
smothVal = Double.parseDouble(smothering.getValue());
siltVal = Double.parseDouble(silting.getValue());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,298 @@

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView;


import com.addisonelliott.segmentedbutton.SegmentedButton;

import com.sf.stormwaterutilityandroid.InspectionForm;
import com.sf.stormwaterutilityandroid.R;
import com.sf.stormwaterutilityandroid.SampleFordm;

import java.util.ArrayList;
import java.util.List;

public class WaterWayFormFragment extends Fragment {
import me.riddhimanadib.formmaster.FormBuilder;
import me.riddhimanadib.formmaster.model.BaseFormElement;
import me.riddhimanadib.formmaster.model.FormElementTextNumber;
import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
import me.riddhimanadib.formmaster.model.FormHeader;


public class WaterWayFormFragment extends Fragment {
RecyclerView rvGen, rvDWS, rvHQ, rvBM,rvCT;
FormBuilder fbGEn,fbDWS,fbBM,fbHQ,fbCT;
SegmentedButton gen,dws,ct,bm,hq;
Button submit;
Boolean boolgen,booldws,boolct,boolbm,boolhq;
List<BaseFormElement> formItemsHQ, formItemsGen, formItemsBM, formItemsCT, formItemsDWS;

Button b1,b2,b3,b4,b5;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {

View root = inflater.inflate(R.layout.fragment_home, container, false);
b1 = root.findViewById(R.id.button);
b1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(getContext(), SampleFordm.class));
}
});

b1 = root.findViewById(R.id.button2);
b1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startActivity(new Intent(getContext(), InspectionForm.class));
}
});


//CHeck To5a.03 project for dealing saved instance state
/*
if (savedInstanceState != null) {
String allPreviousLifecycleCallbacks = savedInstanceState
.getString("Email");
System.out.println("SavedInstanceState: "+allPreviousLifecycleCallbacks);
element11.setValue(allPreviousLifecycleCallbacks);
}
*/
View root = inflater.inflate(R.layout.fragment_wwform, container, false);
//recylerViews for each piece of the form
submit = root.findViewById(R.id.submitForm);
rvGen = root.findViewById(R.id.rvWWF);
rvDWS = root.findViewById(R.id.rvDWS);
rvHQ = root.findViewById(R.id.rvHQ);
rvBM = root.findViewById(R.id.rvBM);
rvCT = root.findViewById(R.id.rvCT);

//making recyclerViews invisible
rvDWS.setVisibility(View.INVISIBLE);
rvHQ.setVisibility(View.INVISIBLE);
rvBM.setVisibility(View.INVISIBLE);
rvCT.setVisibility(View.INVISIBLE);
setupFormGen();
//Segemented Control Bar buttons
gen = root.findViewById(R.id.gen);
dws = root.findViewById(R.id.dws);
ct = root.findViewById(R.id.ct);
bm = root.findViewById(R.id.bm);
hq = root.findViewById(R.id.hq);
//setting booleans to false. If they are true, then an instance of the form section has been created.
boolbm = false;
boolct = false;
booldws = false;
boolhq = false;
boolgen = false;
gen.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
rvGen.setVisibility(View.VISIBLE);
rvDWS.setVisibility(View.INVISIBLE);
rvHQ.setVisibility(View.INVISIBLE);
rvBM.setVisibility(View.INVISIBLE);
rvCT.setVisibility(View.INVISIBLE);
if (!boolgen)
setupFormGen();

}
});
submit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

}
});
dws.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
rvGen.setVisibility(View.INVISIBLE);
rvDWS.setVisibility(View.VISIBLE);
rvHQ.setVisibility(View.INVISIBLE);
rvBM.setVisibility(View.INVISIBLE);
rvCT.setVisibility(View.INVISIBLE);
if (!booldws)
setupFormDWS();

}
});
ct.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
rvGen.setVisibility(View.INVISIBLE);
rvDWS.setVisibility(View.INVISIBLE);
rvHQ.setVisibility(View.INVISIBLE);
rvBM.setVisibility(View.INVISIBLE);
rvCT.setVisibility(View.VISIBLE);
if (!boolct)
setupFormCT();

}
});
bm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

rvGen.setVisibility(View.INVISIBLE);
rvDWS.setVisibility(View.INVISIBLE);
rvHQ.setVisibility(View.INVISIBLE);
rvBM.setVisibility(View.VISIBLE);
rvCT.setVisibility(View.INVISIBLE);
if (!boolbm)
setupFormBM();
}
});
hq.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

rvGen.setVisibility(View.INVISIBLE);
rvDWS.setVisibility(View.INVISIBLE);
rvHQ.setVisibility(View.VISIBLE);
rvBM.setVisibility(View.INVISIBLE);
rvCT.setVisibility(View.INVISIBLE);
if (!boolhq)
setupFormHQ();
}
});


return root;
}

private void setupFormGen() {
boolgen = true;


}
private void setupFormHQ() {
boolhq = true;
fbHQ = new FormBuilder(getContext(),rvHQ);
FormElementTextNumber element2 = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0");
FormElementTextNumber element3 = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0");
FormElementTextNumber element4 = FormElementTextNumber.createInstance().setTitle("Silting").setValue("0");
FormElementTextNumber element5 = FormElementTextNumber.createInstance().setTitle("Rootwads").setValue("0");
FormElementTextNumber element6 = FormElementTextNumber.createInstance().setTitle("Overhanging Veg.").setValue("0");
FormElementTextNumber element7 = FormElementTextNumber.createInstance().setTitle("Oxbows/Black Waters").setValue("0");
FormElementTextNumber element8 = FormElementTextNumber.createInstance().setTitle("Downed Trees/Logs").setValue("0");
FormElementTextNumber element9 = FormElementTextNumber.createInstance().setTitle("Shallows (slow water)").setValue("0");
FormElementTextNumber element10 = FormElementTextNumber.createInstance().setTitle("Water Plants").setValue("0");
FormElementTextNumber element11 = FormElementTextNumber.createInstance().setTitle("Deep Pools").setValue("0");
FormElementTextNumber element12 = FormElementTextNumber.createInstance().setTitle("Logs/Woody Debris").setValue("0");
FormElementTextNumber element13 = FormElementTextNumber.createInstance().setTitle("Boulders").setValue("0");
FormElementTextNumber element14 = FormElementTextNumber.createInstance().setTitle("Undercut Banks").setValue("0");
FormElementTextNumber element15 = FormElementTextNumber.createInstance().setTitle("Sinuosity").setValue("0");
FormElementTextNumber element16 = FormElementTextNumber.createInstance().setTitle("Natural").setValue("0");
FormElementTextNumber element17 = FormElementTextNumber.createInstance().setTitle("Riparian Width").setValue("0");
FormElementTextNumber element18 = FormElementTextNumber.createInstance().setTitle("Land Use").setValue("0");
FormElementTextNumber element19 = FormElementTextNumber.createInstance().setTitle("Bank Erosion").setValue("0");

formItemsHQ = new ArrayList<>();

formItemsHQ.add(element2);
formItemsHQ.add(element3);
formItemsHQ.add(element4);
formItemsHQ.add(element5);
formItemsHQ.add(element6);
formItemsHQ.add(element7);
formItemsHQ.add(element8);
formItemsHQ.add(element9);
formItemsHQ.add(element10);
formItemsHQ.add(element11);
formItemsHQ.add(element12);
formItemsHQ.add(element13);
formItemsHQ.add(element14);
formItemsHQ.add(element15);
formItemsHQ.add(element16);
formItemsHQ.add(element17);
formItemsHQ.add(element18);
formItemsHQ.add(element19);
fbHQ.addFormElements(formItemsHQ);

}
private void setupFormDWS() {
booldws = true;
fbDWS = new FormBuilder(getContext(), rvDWS);
FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening");

//Outfall --> Question: How do you do a subheading?
FormElementTextSingleLine flow = new FormElementTextSingleLine().setTitle("Presence of Flow");
FormElementTextNumber flowData = FormElementTextNumber.createInstance(); //what data type is this?

FormElementTextSingleLine odor = new FormElementTextSingleLine().setTitle("Unusual Odor");
FormElementTextNumber odorData = FormElementTextNumber.createInstance();

FormElementTextSingleLine color = new FormElementTextSingleLine().setTitle("Unusual Color");
FormElementTextNumber colorData = FormElementTextNumber.createInstance();

FormElementTextSingleLine polutants = new FormElementTextSingleLine().setTitle("Polutants Nearby");
FormElementTextNumber polutantsData = FormElementTextNumber.createInstance();
polutantsData.setTitle("Polutants Data");

FormElementTextSingleLine obstruction = new FormElementTextSingleLine().setTitle("Obstruction");
FormElementTextNumber obstructionData = FormElementTextNumber.createInstance();

FormElementTextSingleLine maintenance = new FormElementTextSingleLine().setTitle("Needs Maintenance");
FormElementTextNumber maintenanceData = FormElementTextNumber.createInstance();

FormElementTextSingleLine screen = new FormElementTextSingleLine().setTitle("Screen OK");
FormElementTextNumber screenData = FormElementTextNumber.createInstance();

formItemsDWS = new ArrayList<>();

formItemsDWS.add(flow);
formItemsDWS.add(flowData);
formItemsDWS.add(odor);
formItemsDWS.add(odorData);
formItemsDWS.add(color);
formItemsDWS.add(colorData);
formItemsDWS.add(polutants);
formItemsDWS.add(polutantsData);
formItemsDWS.add(obstruction);
formItemsDWS.add(obstructionData);
formItemsDWS.add(maintenance);
formItemsDWS.add(maintenanceData);
formItemsDWS.add(screen);
formItemsDWS.add(screenData);

fbDWS.addFormElements(formItemsDWS);
}
private void setupFormCT() {
boolct = true;
fbCT = new FormBuilder(getContext(), rvCT);

FormHeader title = (FormHeader) new FormHeader().setTitle("Chemical Testing");

//Outfall --> Question: How do you do a subheading?

FormElementTextSingleLine temperature = new FormElementTextSingleLine().setTitle("Temperature (C) Change");
//FormHeader temp = FormHeader.createInstance("Temperature (C) Change");
FormElementTextNumber tempData = FormElementTextNumber.createInstance(); //what data type is this?

FormElementTextSingleLine tubidity = new FormElementTextSingleLine().setTitle("Tubidity (NTU)");
FormElementTextNumber tubidityData = FormElementTextNumber.createInstance();

FormElementTextSingleLine pH = new FormElementTextSingleLine().setTitle("pH");
FormElementTextNumber pHData = FormElementTextNumber.createInstance();

FormElementTextSingleLine nitrate = new FormElementTextSingleLine().setTitle("Nitrate (mg/L)");
FormElementTextNumber nitrateData = FormElementTextNumber.createInstance();

FormElementTextSingleLine phosphate = new FormElementTextSingleLine().setTitle("Total Phosphate (mg/L)");
FormElementTextNumber phosphateData = FormElementTextNumber.createInstance();

FormElementTextSingleLine oxygen = new FormElementTextSingleLine().setTitle("Dissolved Oxygen (mg/L)");
FormElementTextNumber oxygenData = FormElementTextNumber.createInstance();

FormElementTextSingleLine coli = new FormElementTextSingleLine().setTitle("E Coli (col/100mL)");
FormElementTextNumber coliData = FormElementTextNumber.createInstance();

FormElementTextSingleLine other1 = new FormElementTextSingleLine().setTitle("Other 1");
FormElementTextNumber other1Data = FormElementTextNumber.createInstance();

FormElementTextSingleLine other2 = new FormElementTextSingleLine().setTitle("Other 2");
FormElementTextNumber other2Data = FormElementTextNumber.createInstance();

formItemsCT = new ArrayList<>();

formItemsCT.add(title);
formItemsCT.add(temperature);
formItemsCT.add(tempData);
formItemsCT.add(tubidity);
formItemsCT.add(tubidityData);
formItemsCT.add(pH);
formItemsCT.add(pHData);
formItemsCT.add(nitrate);
formItemsCT.add(nitrateData);
formItemsCT.add(phosphate);
formItemsCT.add(phosphateData);
formItemsCT.add(oxygen);
formItemsCT.add(oxygenData);
formItemsCT.add(coli);
formItemsCT.add(coliData);
formItemsCT.add(other1);
formItemsCT.add(other1Data);
formItemsCT.add(other2);
formItemsCT.add(other2Data);

fbCT.addFormElements(formItemsCT);

}
private void setupFormBM() {
boolbm = true;

}
}
Loading