ok

rcavalie
1 parent c5d66cb2
Showing 5 changed files with 24 additions and 3 deletions Show diff stats
app/src/main/AndroidManifest.xml
app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_hop.java
app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/activity_val.java
app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/plan_hospital.java
app/src/main/res/layout/activity_planhop.xml
@@ -18,7 +18,6 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:screenOrientation="landscape"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 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");
+            }
         }
  
 }
@@ -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);
@@ -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);
+    }
 }
@@ -234,4 +234,17 @@
         android:layout_below="@+id/doc"
         android:background="@android:color/transparent"
         android:onClick="standartiste"/>
+
+    <Button
+        android:id="@+id/ecole"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/doc"
+        android:layout_marginEnd="44dp"
+        android:layout_marginRight="44dp"
+        android:layout_marginTop="13dp"
+        android:layout_toLeftOf="@+id/ortho"
+        android:layout_toStartOf="@+id/ortho"
+        android:background="@color/zxing_transparent"
+        android:onClick="ecole"/>
 </RelativeLayout>
 \ No newline at end of file