Merge pull request #43 from AdrienPoupa/couvre-feu

Add new attestation

Author: AdrienPoupa

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Non sorti]
 
+## [2.0.0] - 2020-10-20
+### Ajouté
+- Attestation de déplacement dérogatoire - Couvre Feu
+
 ## [1.7.0] - 2020-05-13
 ### Ajouté
 - Déclaration de déplacement supérieur à 100km

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.poupa.attestationdeplacement"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 16
-        versionName "1.7.0"
+        versionCode 17
+        versionName "2.0.0"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
 

app/src/main/assets/attestation-100km.pdf

@@ -8,12 +8,8 @@
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
@@ -24,12 +20,9 @@
 import androidx.constraintlayout.widget.ConstraintSet;
 
 import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
 import com.poupa.attestationdeplacement.generator.Attestation;
 import com.poupa.attestationdeplacement.generator.AttestationDeplacementDerogatoireGenerator;
 import com.poupa.attestationdeplacement.generator.AttestationGenerator;
-import com.poupa.attestationdeplacement.generator.AutoAttestationTransportsGenerator;
-import com.poupa.attestationdeplacement.generator.DeclarationDeplacementGenerator;
 import com.poupa.attestationdeplacement.ui.DateTextWatcher;
 
 import java.util.Calendar;
@@ -43,16 +36,10 @@ public class CreateAttestationActivity extends AppCompatActivity {
     private TextInputEditText birthPlaceInput;
     private TextInputEditText addressInput;
     private TextInputEditText cityInput;
-    private TextInputEditText destinationCityInput;
-    private TextInputEditText destinationDepartmentInput;
     private TextInputEditText postalCodeInput;
     private TextInputEditText travelDateInput;
     private TextInputEditText travelHourInput;
-    private TextInputLayout travelHourLayout;
 
-    private TextInputLayout destinationCityLayout;
-    private TextInputLayout destinationDepartmentLayout;
-    private LinearLayout recurringLayout;
     private ConstraintLayout constraintLayout;
     private ConstraintSet constraintSet;
 
@@ -62,12 +49,6 @@ public class CreateAttestationActivity extends AppCompatActivity {
 
     private Attestation attestation;
 
-    public enum AttestationType {
-        DECLARATION_DEPLACEMENT,
-        AUTO_ATTESTATION_TRANSPORTS,
-        ATTESTATION_DEPLACEMENT_DEROGATOIRE
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -86,7 +67,8 @@ protected void onCreate(Bundle savedInstanceState) {
      */
     private void initFields() {
         attestation = new Attestation();
-        attestation.setAttestationType(AttestationType.AUTO_ATTESTATION_TRANSPORTS);
+
+        attestationGenerator = new AttestationDeplacementDerogatoireGenerator(this, attestation);
 
         SharedPreferences userDetails = getSharedPreferences("userDetails", MODE_PRIVATE);
 
@@ -120,14 +102,6 @@ private void initFields() {
 
         postalCodeInput.setText(userDetails.getString("postalCode", ""));
 
-        destinationCityInput = findViewById(R.id.destination_city);
-
-        destinationCityInput.setText(userDetails.getString("destinationCity", ""));
-
-        destinationDepartmentInput = findViewById(R.id.destination_department);
-
-        destinationDepartmentInput.setText(userDetails.getString("destinationDepartment", ""));
-
         travelDateInput = findViewById(R.id.travel_date);
 
         travelHourInput = findViewById(R.id.travel_hour);
@@ -168,22 +142,12 @@ public void onClick(View v) {
             }
         });
 
-        travelHourLayout = findViewById(R.id.travel_hour_layout);
-        destinationCityLayout = findViewById(R.id.destination_city_layout);
-        destinationDepartmentLayout = findViewById(R.id.destination_department_layout);
-        recurringLayout = findViewById(R.id.recurring_layout);
-        constraintLayout = findViewById(R.id.constraint_layout);
-
         constraintSet = new ConstraintSet();
-
-        Spinner spinner = findViewById(R.id.attestation_type);
-
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
-                R.array.attestation_type, android.R.layout.simple_spinner_item);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(adapter);
-
-        spinner.setOnItemSelectedListener(new SpinnerOnItemSelectedListener());
+        constraintLayout = findViewById(R.id.constraint_layout);
+        constraintSet.clone(constraintLayout);
+        constraintSet.connect(R.id.reasonsTextView, ConstraintSet.TOP,
+                R.id.travel_hour_layout, ConstraintSet.BOTTOM);
+        constraintSet.applyTo(constraintLayout);
     }
 
     /**
@@ -271,12 +235,6 @@ public void saveFields() {
         attestation.setPostalCode(postalCodeInput.getText().toString());
         edit.putString("postalCode", attestation.getPostalCode());
 
-        attestation.setDestinationCity(destinationCityInput.getText().toString());
-        edit.putString("destinationCity", attestation.getDestinationCity());
-
-        attestation.setDestinationDepartment(destinationDepartmentInput.getText().toString());
-        edit.putString("destinationDepartment", attestation.getDestinationDepartment());
-
         edit.apply();
 
         // Do not save this for further uses
@@ -298,9 +256,6 @@ public void saveFields() {
         attestation.setReason6(((CheckBox) findViewById(R.id.reason6)).isChecked());
         attestation.setReason7(((CheckBox) findViewById(R.id.reason7)).isChecked());
         attestation.setReason8(((CheckBox) findViewById(R.id.reason8)).isChecked());
-        attestation.setReason9(((CheckBox) findViewById(R.id.reason9)).isChecked());
-
-        attestation.setRecurring(((CheckBox) findViewById(R.id.recurring)).isChecked());
     }
 
     /**
@@ -342,60 +297,4 @@ private void getReasonsDialog() {
         builder.setPositiveButton(getString(android.R.string.ok),null);
         builder.show();
     }
-
-    private class SpinnerOnItemSelectedListener implements AdapterView.OnItemSelectedListener {
-        @Override
-        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-            if (position == 0) {
-                attestation.setAttestationType(AttestationType.DECLARATION_DEPLACEMENT);
-
-                attestationGenerator = new DeclarationDeplacementGenerator(parent.getContext(), attestation);
-
-                travelHourLayout.setVisibility(View.INVISIBLE);
-                destinationCityLayout.setVisibility(View.VISIBLE);
-                destinationDepartmentLayout.setVisibility(View.VISIBLE);
-                recurringLayout.setVisibility(View.VISIBLE);
-
-                constraintSet.clone(constraintLayout);
-                constraintSet.connect(R.id.reasonsTextView, ConstraintSet.TOP,
-                        R.id.recurring_layout, ConstraintSet.BOTTOM);
-                constraintSet.applyTo(constraintLayout);
-
-            } else if (position == 1) {
-                attestation.setAttestationType(AttestationType.AUTO_ATTESTATION_TRANSPORTS);
-
-                attestationGenerator = new AutoAttestationTransportsGenerator(parent.getContext(), attestation);
-
-                travelHourLayout.setVisibility(View.INVISIBLE);
-                destinationCityLayout.setVisibility(View.INVISIBLE);
-                destinationDepartmentLayout.setVisibility(View.INVISIBLE);
-                recurringLayout.setVisibility(View.INVISIBLE);
-
-                constraintSet.clone(constraintLayout);
-                constraintSet.connect(R.id.reasonsTextView, ConstraintSet.TOP,
-                        R.id.travel_date_layout, ConstraintSet.BOTTOM);
-                constraintSet.applyTo(constraintLayout);
-
-            } else {
-                attestation.setAttestationType(AttestationType.ATTESTATION_DEPLACEMENT_DEROGATOIRE);
-
-                attestationGenerator = new AttestationDeplacementDerogatoireGenerator(parent.getContext(), attestation);
-
-                travelHourLayout.setVisibility(View.VISIBLE);
-                destinationCityLayout.setVisibility(View.INVISIBLE);
-                destinationDepartmentLayout.setVisibility(View.INVISIBLE);
-                recurringLayout.setVisibility(View.INVISIBLE);
-
-                constraintSet.clone(constraintLayout);
-                constraintSet.connect(R.id.reasonsTextView, ConstraintSet.TOP,
-                        R.id.travel_hour_layout, ConstraintSet.BOTTOM);
-                constraintSet.applyTo(constraintLayout);
-            }
-        }
-
-        @Override
-        public void onNothingSelected(AdapterView<?> parent) {
-
-        }
-    }
 }

app/src/main/assets/attestation-transports.pdf

@@ -1,14 +1,10 @@
 package com.poupa.attestationdeplacement.generator;
 
-import com.poupa.attestationdeplacement.CreateAttestationActivity;
-
 public class Attestation {
     private int id;
     private String surname;
     private String lastName;
     private String city;
-    private String destinationCity;
-    private String destinationDepartment;
     private String postalCode;
     private String address;
     private String birthPlace;
@@ -22,7 +18,6 @@ public class Attestation {
 
     private StringBuilder motivesQrCode;
     private StringBuilder motivesDatabase;
-    private CreateAttestationActivity.AttestationType attestationType;
     private boolean isReason1;
     private boolean isReason2;
     private boolean isReason3;
@@ -31,8 +26,6 @@ public class Attestation {
     private boolean isReason6;
     private boolean isReason7;
     private boolean isReason8;
-    private boolean isReason9;
-    private boolean isRecurring;
 
     public Attestation() {
         this.motivesDatabase = new StringBuilder();
@@ -86,22 +79,6 @@ public void setCity(String city) {
         this.city = city;
     }
 
-    public String getDestinationCity() {
-        return destinationCity;
-    }
-
-    public void setDestinationCity(String destinationCity) {
-        this.destinationCity = destinationCity;
-    }
-
-    public String getDestinationDepartment() {
-        return destinationDepartment;
-    }
-
-    public void setDestinationDepartment(String destinationDepartment) {
-        this.destinationDepartment = destinationDepartment;
-    }
-
     public String getPostalCode() {
         return postalCode;
     }
@@ -182,14 +159,6 @@ public void setMotivesDatabase(StringBuilder motivesDatabase) {
         this.motivesDatabase = motivesDatabase;
     }
 
-    public CreateAttestationActivity.AttestationType getAttestationType() {
-        return attestationType;
-    }
-
-    public void setAttestationType(CreateAttestationActivity.AttestationType attestationType) {
-        this.attestationType = attestationType;
-    }
-
     public boolean isReason1() {
         return isReason1;
     }
@@ -254,22 +223,6 @@ public void setReason8(boolean reason8) {
         isReason8 = reason8;
     }
 
-    public boolean isReason9() {
-        return isReason9;
-    }
-
-    public void setReason9(boolean reason9) {
-        isReason9 = reason9;
-    }
-
-    public boolean isRecurring() {
-        return isRecurring;
-    }
-
-    public void setRecurring(boolean recurring) {
-        isRecurring = recurring;
-    }
-
     public String getCurrentDate() {
         return currentDate;
     }

app/src/main/assets/attestation.pdf

@@ -19,20 +19,45 @@ String getPdfFilename() {
         return "attestation.pdf";
     }
 
-    /**
-     * Fill the PDF motives
-     */
     protected void fillMotives() throws IOException, DocumentException {
-        super.fillMotives();
+        if (attestation.isReason1()) {
+            form.setField("travail", "Oui");
+            attestation.addMotive("travail");
+        }
 
         if (attestation.isReason2()) {
-            form.setField("Déplacements achats nécéssaires", "Oui");
-            attestation.addMotive("courses");
+            form.setField("sante", "Oui");
+            attestation.addMotive("sante");
+        }
+
+        if (attestation.isReason3()) {
+            form.setField("famille", "Oui");
+            attestation.addMotive("famille");
+        }
+
+        if (attestation.isReason4()) {
+            form.setField("handicap", "Oui");
+            attestation.addMotive("handicap");
         }
 
         if (attestation.isReason5()) {
-            form.setField("Déplacements brefs (activité physique et animaux)", "Oui");
-            attestation.addMotive("sport");
+            form.setField("convocation", "Oui");
+            attestation.addMotive("convocation");
+        }
+
+        if (attestation.isReason6()) {
+            form.setField("missions", "Oui");
+            attestation.addMotive("missions");
+        }
+
+        if (attestation.isReason7()) {
+            form.setField("transits", "Oui");
+            attestation.addMotive("transits");
+        }
+
+        if (attestation.isReason8()) {
+            form.setField("animaux", "Oui");
+            attestation.addMotive("animaux");
         }
     }
 
@@ -50,8 +75,7 @@ protected void fillForm() throws IOException, DocumentException {
         form.setField("Lieu de naissance", attestation.getBirthPlace());
         form.setField("Adresse actuelle", attestation.getFullAddress());
 
-        form.setField("Heure", attestation.getHour());
-        form.setField("Minute", attestation.getMinute());
+        form.setField("HeureMinute", attestation.getHour() + ':' + attestation.getMinute());
 
         form.setField("Ville", attestation.getCity());
         form.setField("Date", attestation.getTravelDate());
@@ -62,8 +86,8 @@ protected void fillForm() throws IOException, DocumentException {
      * @return
      */
     protected String getQrCodeText() {
-        return "Cree le: " + attestation.getCurrentDate() + " a " + attestation.getCurrentTime() + ";Nom: " + attestation.getLastName() + ";Prenom: " + attestation.getSurname() + ";" +
-                "Naissance: " + attestation.getBirthDate() + " a " + attestation.getBirthPlace() + ";Adresse: " + attestation.getFullAddress() + ";" +
-                "Sortie: " + attestation.getTravelDate() + " a " + attestation.getTravelHour() + ";Motifs: " + attestation.getMotivesQrCode();
+        return "Cree le: " + attestation.getCurrentDate() + " a " + attestation.getCurrentTime() + ";\n Nom: " + attestation.getLastName() + ";\n Prenom: " + attestation.getSurname() + ";\n " +
+                "Naissance: " + attestation.getBirthDate() + " a " + attestation.getBirthPlace() + ";\n Adresse: " + attestation.getFullAddress() + ";\n " +
+                "Sortie: " + attestation.getTravelDate() + " a " + attestation.getTravelHour() + ";\n Motifs: " + attestation.getMotivesQrCode();
     }
 }