diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4f074bd..4d3a800 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,6 @@ diff --git a/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_hop.java b/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_hop.java index ad54a59..47cadd2 100644 --- a/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_hop.java +++ b/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_hop.java @@ -1,7 +1,6 @@ package ssrmarcsautelet.automation.appli.ssrmarcsautelet; import android.os.Bundle; -import android.os.Environment; import android.support.v7.app.AppCompatActivity; import android.webkit.WebSettings; import android.webkit.WebView; @@ -96,6 +95,10 @@ public class activity_hop extends AppCompatActivity { fiche_educ.loadUrl("file:///sdcard/SSR_docs/orga_standard.html"); } + if (result_appui2.equals("ecole")) + { + fiche_educ.loadUrl("file:///sdcard/SSR_docs/orga_ecole.html"); + } } } diff --git a/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_val.java b/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_val.java index 52fa462..b2f08f1 100644 --- a/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_val.java +++ b/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_val.java @@ -87,6 +87,7 @@ public class activity_val extends AppCompatActivity { "orga_assist.html", "orga_cadre.html", "orga_doc.html", + "orga_ecole", "orga_ergo.html", "orga_grands.html", "orga_inf.html", @@ -278,7 +279,7 @@ public class activity_val extends AppCompatActivity { url + dir[166], url + dir[167], url + dir[168], url + dir[169], url + dir[170], url + dir[171], url + dir[172], url + dir[173], url + dir[174], url + dir[175], url + dir[176], url + dir[177], url + dir[178], url + dir[179], url + dir[180], url + dir[181], url + dir[182], url + dir[183], url + dir[184], url + dir[185], url + dir[186], - url + dir[187], url + dir[188], url + dir[189], url + dir[190]);// + url + dir[187], url + dir[188], url + dir[189], url + dir[190], url + dir[191]);// context = getApplicationContext(); Toast toast1 = Toast.makeText(context, "Téléchargement en cours", duration); diff --git a/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/plan_hospital.java b/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/plan_hospital.java index 37d8ed4..f3e23fd 100644 --- a/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/plan_hospital.java +++ b/app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/plan_hospital.java @@ -127,4 +127,9 @@ public class plan_hospital extends AppCompatActivity startActivity(i); } + public void ecole(View v) { + Intent i = new Intent(plan_hospital.this, activity_hop.class); + i.putExtra("result_appui","ecole"); + startActivity(i); + } } diff --git a/app/src/main/res/layout/activity_planhop.xml b/app/src/main/res/layout/activity_planhop.xml index ab8cf3e..99b6099 100644 --- a/app/src/main/res/layout/activity_planhop.xml +++ b/app/src/main/res/layout/activity_planhop.xml @@ -234,4 +234,17 @@ android:layout_below="@+id/doc" android:background="@android:color/transparent" android:onClick="standartiste"/> + +