From baf79378eece2b8a2e0395a589161776f9b33d88 Mon Sep 17 00:00:00 2001 From: "josephine.vetu" Date: Mon, 20 Jan 2025 17:21:08 +0100 Subject: [PATCH] changes not detected --- .../com/example/depanntout/GestionInter.java | 14 +- .../com/example/depanntout/ModifInter.java | 34 ++-- .../res/layout/activity_gestion_inter.xml | 4 +- .../main/res/layout/activity_modif_client.xml | 99 ++++++++++ .../main/res/layout/activity_modif_inter.xml | 5 +- .../app/src/main/res/layout/activity_test.xml | 6 + Depanntout/.gitignore | 15 ++ Depanntout/app/.gitignore | 1 + Depanntout/app/build.gradle.kts | 43 ++++ Depanntout/app/proguard-rules.pro | 21 ++ .../depanntout/ExampleInstrumentedTest.java | 26 +++ Depanntout/app/src/main/AndroidManifest.xml | 41 ++++ .../app/src/main/java/bdd/ClientDAO.java | 51 +++++ .../src/main/java/bdd/CreateBdDepannTout.java | 128 ++++++++++++ Depanntout/app/src/main/java/bdd/DAO.java | 34 ++++ .../src/main/java/bdd/InterventionDAO.java | 52 +++++ .../com/example/depanntout/CreateClient.java | 91 +++++++++ .../com/example/depanntout/CreateInter.java | 89 +++++++++ .../com/example/depanntout/GestionClient.java | 84 ++++++++ .../com/example/depanntout/GestionInter.java | 86 ++++++++ .../com/example/depanntout/MainActivity.java | 74 +++++++ .../com/example/depanntout/ModifClient.java | 4 + .../com/example/depanntout/ModifInter.java | 56 ++++++ .../app/src/main/java/metier/Client.java | 63 ++++++ .../src/main/java/metier/Intervention.java | 71 +++++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 +++ .../app/src/main/res/drawable/logodepann.png | Bin 0 -> 500248 bytes .../res/layout/activity_create_client.xml | 131 +++++++++++++ .../main/res/layout/activity_create_inter.xml | 96 +++++++++ .../res/layout/activity_gestion_client.xml | 58 ++++++ .../res/layout/activity_gestion_inter.xml | 58 ++++++ .../app/src/main/res/layout/activity_main.xml | 48 +++++ .../src/main/res/layout/activity_main1.xml | 0 .../main/res/layout/activity_modif_inter.xml | 99 ++++++++++ .../app/src/main/res/layout/header_layout.xml | 31 +++ .../app/src/main/res/layout/ligne_client.xml | 48 +++++ .../app/src/main/res/layout/ligne_client3.xml | 0 .../main/res/layout/ligne_intervention.xml | 58 ++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../app/src/main/res/values-night/themes.xml | 16 ++ Depanntout/app/src/main/res/values/colors.xml | 10 + .../app/src/main/res/values/strings.xml | 36 ++++ Depanntout/app/src/main/res/values/themes.xml | 19 ++ .../app/src/main/res/xml/backup_rules.xml | 13 ++ .../main/res/xml/data_extraction_rules.xml | 19 ++ .../example/depanntout/ExampleUnitTest.java | 17 ++ Depanntout/build.gradle.kts | 4 + Depanntout/gradle.properties | 21 ++ Depanntout/gradlew | 185 ++++++++++++++++++ Depanntout/gradlew.bat | 89 +++++++++ Depanntout/settings.gradle.kts | 24 +++ Inventaire/.idea/vcs.xml | 6 + 64 files changed, 2467 insertions(+), 23 deletions(-) create mode 100644 Android_DepannTout/app/src/main/res/layout/activity_modif_client.xml create mode 100644 Android_DepannTout/app/src/main/res/layout/activity_test.xml create mode 100644 Depanntout/.gitignore create mode 100644 Depanntout/app/.gitignore create mode 100644 Depanntout/app/build.gradle.kts create mode 100644 Depanntout/app/proguard-rules.pro create mode 100644 Depanntout/app/src/androidTest/java/com/example/depanntout/ExampleInstrumentedTest.java create mode 100644 Depanntout/app/src/main/AndroidManifest.xml create mode 100644 Depanntout/app/src/main/java/bdd/ClientDAO.java create mode 100644 Depanntout/app/src/main/java/bdd/CreateBdDepannTout.java create mode 100644 Depanntout/app/src/main/java/bdd/DAO.java create mode 100644 Depanntout/app/src/main/java/bdd/InterventionDAO.java create mode 100644 Depanntout/app/src/main/java/com/example/depanntout/CreateClient.java create mode 100644 Depanntout/app/src/main/java/com/example/depanntout/CreateInter.java create mode 100644 Depanntout/app/src/main/java/com/example/depanntout/GestionClient.java create mode 100644 Depanntout/app/src/main/java/com/example/depanntout/GestionInter.java create mode 100644 Depanntout/app/src/main/java/com/example/depanntout/MainActivity.java create mode 100644 Depanntout/app/src/main/java/com/example/depanntout/ModifClient.java create mode 100644 Depanntout/app/src/main/java/com/example/depanntout/ModifInter.java create mode 100644 Depanntout/app/src/main/java/metier/Client.java create mode 100644 Depanntout/app/src/main/java/metier/Intervention.java create mode 100644 Depanntout/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 Depanntout/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 Depanntout/app/src/main/res/drawable/logodepann.png create mode 100644 Depanntout/app/src/main/res/layout/activity_create_client.xml create mode 100644 Depanntout/app/src/main/res/layout/activity_create_inter.xml create mode 100644 Depanntout/app/src/main/res/layout/activity_gestion_client.xml create mode 100644 Depanntout/app/src/main/res/layout/activity_gestion_inter.xml create mode 100644 Depanntout/app/src/main/res/layout/activity_main.xml rename {Android_DepannTout => Depanntout}/app/src/main/res/layout/activity_main1.xml (100%) create mode 100644 Depanntout/app/src/main/res/layout/activity_modif_inter.xml create mode 100644 Depanntout/app/src/main/res/layout/header_layout.xml create mode 100644 Depanntout/app/src/main/res/layout/ligne_client.xml rename {Android_DepannTout => Depanntout}/app/src/main/res/layout/ligne_client3.xml (100%) create mode 100644 Depanntout/app/src/main/res/layout/ligne_intervention.xml create mode 100644 Depanntout/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 Depanntout/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 Depanntout/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 Depanntout/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 Depanntout/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 Depanntout/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 Depanntout/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 Depanntout/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 Depanntout/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 Depanntout/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 Depanntout/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 Depanntout/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 Depanntout/app/src/main/res/values-night/themes.xml create mode 100644 Depanntout/app/src/main/res/values/colors.xml create mode 100644 Depanntout/app/src/main/res/values/strings.xml create mode 100644 Depanntout/app/src/main/res/values/themes.xml create mode 100644 Depanntout/app/src/main/res/xml/backup_rules.xml create mode 100644 Depanntout/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 Depanntout/app/src/test/java/com/example/depanntout/ExampleUnitTest.java create mode 100644 Depanntout/build.gradle.kts create mode 100644 Depanntout/gradle.properties create mode 100644 Depanntout/gradlew create mode 100644 Depanntout/gradlew.bat create mode 100644 Depanntout/settings.gradle.kts create mode 100644 Inventaire/.idea/vcs.xml diff --git a/Android_DepannTout/app/src/main/java/com/example/depanntout/GestionInter.java b/Android_DepannTout/app/src/main/java/com/example/depanntout/GestionInter.java index cade04b..5c36629 100644 --- a/Android_DepannTout/app/src/main/java/com/example/depanntout/GestionInter.java +++ b/Android_DepannTout/app/src/main/java/com/example/depanntout/GestionInter.java @@ -14,12 +14,12 @@ import androidx.appcompat.app.AppCompatActivity; import bdd.InterventionDAO; -public class GestionInter extends AppCompatActivity { +public class GestionInter2 extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_gestion_inter); + setContentView(R.layout.activity_gestion_inter2); initialisation(); afficherLesInterventions(); } @@ -45,7 +45,7 @@ public class GestionInter extends AppCompatActivity { } private void demarrerCreerInter(){ - Intent intent = new Intent(GestionInter.this, CreateInter.class); + Intent intent = new Intent(GestionInter2.this, CreateInter.class); startActivity(intent); } @@ -58,7 +58,7 @@ public class GestionInter extends AppCompatActivity { String[] from = new String[]{"date", "heure", "observation", "idCli"}; int[] to = new int[] {R.id.tvDateLigne, R.id.tvHeureLigne, R.id.tvObsLigne, R.id.tvIdClientInterLigne}; SimpleCursorAdapter dataAdapter = new SimpleCursorAdapter(this, R.layout.ligne_intervention, c, from, to, 0); - ListView lvInterventions = (ListView) findViewById(R.id.lvClients); + ListView lvInterventions = (ListView) findViewById(R.id.lvInter); lvInterventions.setAdapter(dataAdapter); // Set an item click listener for the ListView @@ -73,11 +73,15 @@ public class GestionInter extends AppCompatActivity { int idCli = c.getInt(c.getColumnIndexOrThrow("idCli")); // Pass the details to the new activity using Intent - Intent intent = new Intent(this, ModifInter.class); + Intent intent = new Intent(this, ModifInter2.class); intent.putExtra("idCli", idCli); intent.putExtra("date", date); intent.putExtra("heure", heure); intent.putExtra("observation", observation); +// intent.putExtra("date", "2025-01-20"); +// intent.putExtra("heure", "15:30"); +// intent.putExtra("observation", "Observation example"); +// intent.putExtra("idCli", 123); startActivity(intent); }); } diff --git a/Android_DepannTout/app/src/main/java/com/example/depanntout/ModifInter.java b/Android_DepannTout/app/src/main/java/com/example/depanntout/ModifInter.java index 411fd5d..b32497c 100644 --- a/Android_DepannTout/app/src/main/java/com/example/depanntout/ModifInter.java +++ b/Android_DepannTout/app/src/main/java/com/example/depanntout/ModifInter.java @@ -3,17 +3,16 @@ package com.example.depanntout; import android.os.Bundle; import android.view.View; import android.widget.Button; -import android.widget.TextView; +import android.widget.EditText; import androidx.appcompat.app.AppCompatActivity; -public class ModifInter extends AppCompatActivity { +public class ModifInter2 extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_modif_inter); - + setContentView(R.layout.activity_modif_inter2); initialisation(); } @@ -26,16 +25,16 @@ public class ModifInter extends AppCompatActivity { int idCli = getIntent().getIntExtra("idCli", -1); // Reference TextViews - TextView tvDate = findViewById(R.id.ptModifDate); - TextView tvHeure = findViewById(R.id.ptModifHeure); - TextView tvObservation = findViewById(R.id.ptModifObserv); - TextView tvIdCli = findViewById(R.id.ptModifIdClient); + EditText etDate = findViewById(R.id.ptModifDate); + EditText etHeure = findViewById(R.id.ptModifHeure); + EditText etObservation = findViewById(R.id.ptModifObserv); + EditText etIdCli = findViewById(R.id.ptModifIdClient); // Set data in TextViews - tvDate.setText(date); - tvHeure.setText(heure); - tvObservation.setText(observation); - tvIdCli.setText(String.valueOf(idCli)); + if (date != null) etDate.setText(date); + if (heure != null) etHeure.setText(heure); + if (observation != null) etObservation.setText(observation); + etIdCli.setText(idCli != -1 ? String.valueOf(idCli) : ""); // gestion du boutton Quitter Button btQuitterInter = (Button) findViewById(R.id.btQuitterInter); @@ -47,10 +46,17 @@ public class ModifInter extends AppCompatActivity { }); Button btnDelete = findViewById(R.id.btnDeleteInter); - btnDelete.setOnClickListener(v -> supprimer()); + btnDelete.setOnClickListener(v -> supprimerInter()); + + Button btnModif = findViewById(R.id.btnModifInter); + btnModif.setOnClickListener(v -> modifierInter()); } - private void supprimer() { + private void supprimerInter() { + + } + + private void modifierInter() { } } diff --git a/Android_DepannTout/app/src/main/res/layout/activity_gestion_inter.xml b/Android_DepannTout/app/src/main/res/layout/activity_gestion_inter.xml index f02394e..8953b85 100644 --- a/Android_DepannTout/app/src/main/res/layout/activity_gestion_inter.xml +++ b/Android_DepannTout/app/src/main/res/layout/activity_gestion_inter.xml @@ -9,7 +9,7 @@ > + android:orientation="vertical"> @@ -27,7 +27,7 @@ android:textSize="20sp" /> diff --git a/Android_DepannTout/app/src/main/res/layout/activity_modif_client.xml b/Android_DepannTout/app/src/main/res/layout/activity_modif_client.xml new file mode 100644 index 0000000..5d14fee --- /dev/null +++ b/Android_DepannTout/app/src/main/res/layout/activity_modif_client.xml @@ -0,0 +1,99 @@ + + + + > + + + + + + + + + + + + + + + + + + + + + + +