Før signert build

app/src/main/java/com/kbs/kbsintranett/HandbookDetailFragment.java

@@ -1,21 +1,29 @@
-// FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookDetailFragment.java
 package com.kbs.kbsintranett;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
-import android.widget.TextView;
 import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.text.HtmlCompat; // Bedre HTML støtte
 import androidx.fragment.app.Fragment;
 import androidx.navigation.Navigation;
+
+import com.google.gson.JsonObject;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -23,11 +31,116 @@ import retrofit2.Response;
 public class HandbookDetailFragment extends Fragment {
 
     private int pageId;
-    private String pageTitle; // Fallback tittel før lasting
+    private String pageTitle;
-    private TextView titleView;
+    private WebView webView;
-    private TextView contentView;
     private ProgressBar progressBar;
 
+    // --- CSS: DESIGN MED MER LUFT ---
+    private static final String CSS_STYLE =
+            "<style>" +
+                    "body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #333333; line-height: 1.6; padding: 16px; margin: 0; }" +
+
+                    "h1 { color: #0069B3; font-size: 24px; border-bottom: 2px solid #0069B3; padding-bottom: 10px; margin-top: 0; }" +
+                    "p, ul, li { margin-bottom: 12px; }" +
+                    "a { color: #0069B3; font-weight: bold; text-decoration: none; }" +
+
+                    // --- BOKSEN ---
+                    ".trekkspill { " +
+                    "   background-color: #fff; " +
+                    "   border: 1px solid #ddd; " +
+                    "   border-radius: 4px; " +
+                    "   max-height: 58px; " + // LUKKET
+                    "   overflow: hidden; " +
+                    "   transition: max-height 0.4s ease; " +
+
+                    // LUFT OG AVSTAND
+                    "   margin-top: 32px; " +
+                    "   margin-bottom: 16px; " +
+                    "}" +
+
+                    // --- KNAPPEN ---
+                    ".trekkspill > a[id^='fl-accordion--label-'] { " +
+                    "   display: flex; " +
+                    "   justify-content: space-between; " +
+                    "   align-items: center; " +
+                    "   background-color: #f2f2f2; " +
+                    "   color: #0069B3; " +
+                    "   padding: 15px; " +
+                    "   font-weight: bold; " +
+                    "   cursor: pointer; " +
+                    "   width: 100%; " +
+                    "   height: 58px; " +
+                    "   box-sizing: border-box; " +
+                    "   pointer-events: auto; " +
+                    "}" +
+
+                    // --- PLUSS-TEGN ---
+                    ".trekkspill > a[id^='fl-accordion--label-']::after { " +
+                    "   content: '+'; " +
+                    "   font-size: 24px; " +
+                    "   font-weight: bold; " +
+                    "   color: #0069B3; " +
+                    "}" +
+
+                    // --- ÅPEN TILSTAND ---
+                    ".trekkspill.open { " +
+                    "   max-height: 4000px; " + // ÅPEN
+                    "   overflow: visible; " +
+                    "   border-color: #0069B3; " +
+                    "}" +
+
+                    ".trekkspill.open > a[id^='fl-accordion--label-'] { " +
+                    "   background-color: #0069B3; " +
+                    "   color: #ffffff; " +
+                    "}" +
+
+                    ".trekkspill.open > a[id^='fl-accordion--label-']::after { " +
+                    "   content: '-'; " +
+                    "   color: #ffffff; " +
+                    "}" +
+
+                    // --- RYDDEJOBB ---
+                    ".trekkspill > a[id^='fl-accordion--icon-'] { display: none !important; }" +
+                    ".trekkspill > h2 { display: none; }" +
+                    ".trekkspill > p, .trekkspill > ul, .trekkspill > div { padding: 10px 15px; }" +
+
+                    "</style>";
+
+    // --- JAVASCRIPT: AUTOSCROLL ---
+    private static final String JS_SCRIPT =
+            "<script>" +
+                    "document.onclick = function(e) {\n" +
+                    "    var target = e.target.closest('a[id^=\"fl-accordion--label-\"]');\n" +
+                    "    \n" +
+                    "    if (target) {\n" +
+                    "        e.preventDefault();\n" +
+                    "        \n" +
+                    "        var currentBox = target.closest('.trekkspill');\n" +
+                    "        \n" +
+                    "        if (currentBox) {\n" +
+                    "            var wasOpen = currentBox.classList.contains('open');\n" +
+                    "            \n" +
+                    "            // LUKK ALLE ANDRE\n" +
+                    "            var allOpenBoxes = document.querySelectorAll('.trekkspill.open');\n" +
+                    "            allOpenBoxes.forEach(function(box) {\n" +
+                    "                box.classList.remove('open');\n" +
+                    "            });\n" +
+                    "            \n" +
+                    "            // ÅPNE DEN VALGTE\n" +
+                    "            if (!wasOpen) {\n" +
+                    "                currentBox.classList.add('open');\n" +
+                    "                \n" +
+                    "                // AUTOSCROLL: Økt til 300ms for å vente på CSS-animasjonen\n" +
+                    "                setTimeout(function() {\n" +
+                    "                    currentBox.scrollIntoView({behavior: 'smooth', block: 'start'});\n" +
+                    "                }, 300);\n" +
+                    "            }\n" +
+                    "        }\n" +
+                    "        return false;\n" +
+                    "    }\n" +
+                    "};" +
+                    "</script>";
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -38,28 +151,187 @@ public class HandbookDetailFragment extends Fragment {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        // Hent argumenter fra navigasjon
         if (getArguments() != null) {
             pageId = getArguments().getInt("page_id");
             pageTitle = getArguments().getString("page_title");
         }
 
         Toolbar toolbar = view.findViewById(R.id.detail_toolbar);
-        toolbar.setTitle("Håndbok");
+        toolbar.setTitle(pageTitle != null ? pageTitle : "Håndbok");
         toolbar.setNavigationOnClickListener(v -> Navigation.findNavController(view).navigateUp());
 
-        titleView = view.findViewById(R.id.detail_title);
+        webView = view.findViewById(R.id.detail_webview);
-        contentView = view.findViewById(R.id.detail_content);
         progressBar = view.findViewById(R.id.detail_loading);
 
-        titleView.setText(pageTitle); // Sett midlertidig tittel
+        setupWebView();
-
         fetchContent();
     }
 
+    private void setupWebView() {
+        WebSettings settings = webView.getSettings();
+        settings.setJavaScriptEnabled(true);
+        settings.setDomStorageEnabled(true);
+        settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
+
+        webView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return handleLinkClick(request.getUrl().toString());
+            }
+
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                return handleLinkClick(url);
+            }
+        });
+    }
+
+    private boolean handleLinkClick(String url) {
+        // Ignorer klikk på accordion-lenker
+        if (url.endsWith("#")) return true;
+
+        String lowerUrl = url.toLowerCase();
+        int formIdToOpen = 0;
+
+        // --- SPESIALHÅNDTERING: Link til Skjemaer basert på URL-nøkkelord ---
+
+        // ID 1: Ansatteopplysninger
+        if (lowerUrl.contains("ansatteopplysninger")) {
+            formIdToOpen = 1;
+        }
+        // ID 2: Vernerunde
+        else if (lowerUrl.contains("vernerunde")) {
+            formIdToOpen = 2;
+        }
+        // ID 4: RUH (Rapport om uønsket hendelse)
+        else if (lowerUrl.contains("uonsket-hendelse") || lowerUrl.contains("/ruh")) {
+            formIdToOpen = 4;
+        }
+        // ID 5: Lån av verktøy/henger
+        else if (lowerUrl.contains("lan-av") || lowerUrl.contains("verktoy")) {
+            formIdToOpen = 5;
+        }
+        // ID 6: Avviksmelding
+        else if (lowerUrl.contains("avviksmelding") || lowerUrl.contains("/avvik")) {
+            formIdToOpen = 6;
+        }
+        // ID 9: Sikkerhetskurs / Kompetansebevis
+        else if (lowerUrl.contains("sikkerhetskurs") || lowerUrl.contains("kompetansebevis")) {
+            formIdToOpen = 9;
+        }
+        // ID 10: HMS Bekreftelse
+        else if (lowerUrl.contains("hms-bekreftelse") || lowerUrl.contains("hms-policy")) {
+            formIdToOpen = 10;
+        }
+        // ID 11: Egenmelding
+        else if (lowerUrl.contains("egenmelding")) {
+            formIdToOpen = 11;
+        }
+        // ID 12: Sjekkliste firmabil
+        else if (lowerUrl.contains("sjekkliste") && (lowerUrl.contains("bil") || lowerUrl.contains("kjoretoy"))) {
+            formIdToOpen = 12;
+        }
+        // ID 14: SJA (Sikker Jobbanalyse)
+        else if (lowerUrl.contains("sja") || lowerUrl.contains("jobbanalyse")) {
+            formIdToOpen = 14;
+        }
+        // ID 15: Fraværsvarsel
+        else if (lowerUrl.contains("fravaersvarsel") || lowerUrl.contains("fravarsvarsel")) {
+            formIdToOpen = 15;
+        }
+        // ID 16: Refusjon utlegg
+        else if (lowerUrl.contains("refusjon") || lowerUrl.contains("utlegg")) {
+            formIdToOpen = 16;
+        }
+        // ID 21: Medarbeidersamtale
+        else if (lowerUrl.contains("medarbeidersamtale")) {
+            formIdToOpen = 21;
+        }
+        // ID 22: Medarbeiderundersøkelse
+        else if (lowerUrl.contains("medarbeiderundersokelse")) {
+            formIdToOpen = 22;
+        }
+
+        // Hvis vi fant et skjema, naviger dit internt
+        if (formIdToOpen > 0) {
+            Bundle bundle = new Bundle();
+            bundle.putInt("formId", formIdToOpen);
+            Navigation.findNavController(getView()).navigate(R.id.action_handbook_to_form, bundle);
+            return true;
+        }
+
+        // --- STANDARD INTERN NAVIGASJON ---
+        if (url.contains("intranet.kbs.no") || url.startsWith("/")) {
+            int targetId = extractIdFromUrl(url);
+            if (targetId > 0) {
+                navigateToPage(targetId, "Laster...");
+                return true;
+            }
+
+            progressBar.setVisibility(View.VISIBLE);
+            RetrofitClient.getApiService().lookupPageId(url).enqueue(new Callback<JsonObject>() {
+                @Override
+                public void onResponse(Call<JsonObject> call, Response<JsonObject> response) {
+                    if (!isAdded()) return;
+                    progressBar.setVisibility(View.GONE);
+
+                    if (response.isSuccessful() && response.body() != null) {
+                        int id = response.body().get("id").getAsInt();
+                        if (id > 0) {
+                            navigateToPage(id, "Laster...");
+                        } else {
+                            openExternal(url);
+                        }
+                    } else {
+                        openExternal(url);
+                    }
+                }
+
+                @Override
+                public void onFailure(Call<JsonObject> call, Throwable t) {
+                    if (!isAdded()) return;
+                    progressBar.setVisibility(View.GONE);
+                    openExternal(url);
+                }
+            });
+            return true;
+        } else {
+            // Ekstern lenke
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            startActivity(browserIntent);
+            return true;
+        }
+    }
+
+    private void navigateToPage(int id, String title) {
+        Bundle bundle = new Bundle();
+        bundle.putInt("page_id", id);
+        bundle.putString("page_title", title);
+        Navigation.findNavController(getView()).navigate(R.id.action_handbook_to_detail, bundle);
+    }
+
+    private void openExternal(String url) {
+        Intent intent = new Intent(getContext(), WebViewActivity.class);
+        intent.putExtra(WebViewActivity.EXTRA_URL, url);
+        intent.putExtra(WebViewActivity.EXTRA_TITLE, "KBS Intranett");
+        startActivity(intent);
+    }
+
+    private int extractIdFromUrl(String url) {
+        Pattern p = Pattern.compile("[?&](p|page_id|post)=([0-9]+)");
+        Matcher m = p.matcher(url);
+        if (m.find()) {
+            try {
+                return Integer.parseInt(m.group(2));
+            } catch (NumberFormatException e) {
+                return 0;
+            }
+        }
+        return 0;
+    }
+
     private void fetchContent() {
         progressBar.setVisibility(View.VISIBLE);
-
         RetrofitClient.getApiService().getHandbookPage(pageId).enqueue(new Callback<HandbookPage>() {
             @Override
             public void onResponse(Call<HandbookPage> call, Response<HandbookPage> response) {
@@ -68,17 +340,29 @@ public class HandbookDetailFragment extends Fragment {
 
                 if (response.isSuccessful() && response.body() != null) {
                     HandbookPage page = response.body();
-                    titleView.setText(page.title);
 
-                    // RENDERING AV HTML
+                    if (getView() != null) {
-                    // HtmlCompat.FROM_HTML_MODE_COMPACT håndterer grunnleggende tags (p, br, b, i, h1-h6, ul, li)
+                        Toolbar toolbar = getView().findViewById(R.id.detail_toolbar);
-                    // Det støtter dessverre ikke tabeller eller bilder optimalt rett i TextView.
+                        if (toolbar != null) toolbar.setTitle(page.title);
-                    if (page.content != null) {
-                        contentView.setText(HtmlCompat.fromHtml(page.content, HtmlCompat.FROM_HTML_MODE_COMPACT));
-                        contentView.setMovementMethod(LinkMovementMethod.getInstance()); // Gjør linker klikkbare
-                    } else {
-                        contentView.setText("Ingen innhold funnet.");
                     }
+
+                    String htmlContent = "<!DOCTYPE html><html><head>" +
+                            "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">" +
+                            CSS_STYLE +
+                            JS_SCRIPT +
+                            "</head><body>";
+
+                    htmlContent += "<h1>" + page.title + "</h1>";
+
+                    if (page.content != null) {
+                        htmlContent += page.content;
+                    } else {
+                        htmlContent += "<p>Ingen innhold funnet.</p>";
+                    }
+                    htmlContent += "</body></html>";
+
+                    webView.loadDataWithBaseURL("https://intranet.kbs.no", htmlContent, "text/html", "UTF-8", null);
+
                 } else {
                     Toast.makeText(getContext(), "Kunne ikke laste innhold.", Toast.LENGTH_SHORT).show();
                 }

app/src/main/java/com/kbs/kbsintranett/ProfileFragment.java

@@ -26,6 +26,7 @@ public class ProfileFragment extends Fragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_profile, container, false);
+
         // 1. Finn Views
         ImageView closeBtn = view.findViewById(R.id.btn_close_profile);
         ImageView profileImage = view.findViewById(R.id.profile_image);
@@ -33,6 +34,7 @@ public class ProfileFragment extends Fragment {
         TextView emailText = view.findViewById(R.id.profile_email);
         TextView roleText = view.findViewById(R.id.profile_role);
         Button logoutBtn = view.findViewById(R.id.btn_logout);
+        Button updateInfoBtn = view.findViewById(R.id.btn_update_info); // NY
 
         // 2. Hent data fra UserManager
         UserManager user = UserManager.getInstance();
@@ -53,7 +55,14 @@ public class ProfileFragment extends Fragment {
             Navigation.findNavController(view).navigateUp();
         });
 
-        // 5. Håndter utlogging
+        // 5. Håndter "Oppdater opplysninger" (Skjema ID 1)
+        updateInfoBtn.setOnClickListener(v -> {
+            Bundle bundle = new Bundle();
+            bundle.putInt("formId", 1); // ID 1 er Ansatteopplysninger
+            Navigation.findNavController(view).navigate(R.id.action_profile_to_form, bundle);
+        });
+
+        // 6. Håndter utlogging
         logoutBtn.setOnClickListener(v -> performLogout());
 
         return view;

app/src/main/res/layout/fragment_handbook.xml

@@ -22,6 +22,15 @@
             android:textColor="#333333"
             android:layout_marginBottom="12dp"/>
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="KBS Klima og Byggservice ønsker å ta vare på miljø og helse, og har derfor utarbeidet en håndbok som omhandler disse temaene. For enkelthets skyld er denne publisert i KBS-appen og på Intranettet.\n\nDet forventes at alle ansatte skal ha lest hele håndboken minst én gang, og at de har lest og forstått bedriftens HMS-målsetting senest 1. april hvert år."
+            android:textSize="14sp"
+            android:textColor="#666666"
+            android:lineSpacingExtra="4dp"
+            android:layout_marginBottom="16dp"/>
+
         <EditText
             android:id="@+id/search_field"
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_handbook_detail.xml

@@ -15,42 +15,23 @@
         app:navigationIcon="@android:drawable/ic_menu_revert"
         app:titleTextColor="@color/black" />
 
-    <androidx.core.widget.NestedScrollView
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
+        <WebView
+            android:id="@+id/detail_webview"
             android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbars="vertical" />
+
+        <ProgressBar
+            android:id="@+id/detail_loading"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:layout_centerInParent="true"
-            android:padding="24dp">
+            android:visibility="gone"/>
 
-            <TextView
+    </RelativeLayout>
-                android:id="@+id/detail_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Tittel"
-                android:textSize="28sp"
-                android:textStyle="bold"
-                android:textColor="@color/kbs_logo_blue"
-                android:layout_marginBottom="24dp"/>
 
-            <TextView
-                android:id="@+id/detail_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="#333333"
-                android:textSize="16sp"
-                android:lineSpacingExtra="6dp"
-                android:linksClickable="true" />
-
-            <ProgressBar
-                android:id="@+id/detail_loading"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="32dp"/>
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
 </LinearLayout>

app/src/main/res/layout/fragment_profile.xml

@@ -5,44 +5,50 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="16dp"
-    android:background="@color/kbs_very_light_blue"> <RelativeLayout
+    android:background="@color/kbs_very_light_blue">
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="32dp"
-    android:paddingHorizontal="10dp"
-    android:background="@color/kbs_logo_blue" > <ImageView
-    android:id="@+id/btn_close_profile"
-    android:layout_width="40dp"
-    android:layout_height="40dp"
-    android:src="@android:drawable/ic_menu_close_clear_cancel"
-    android:background="?attr/selectableItemBackgroundBorderless"
-    android:padding="4dp"
-    android:layout_alignParentStart="true"
-    android:layout_centerVertical="true"
-    app:tint="@color/white"/>
 
-    <TextView
+    <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Min Profil"
+        android:layout_marginBottom="32dp"
-        android:textSize="20sp"
+        android:paddingHorizontal="10dp"
-        android:textStyle="bold"
+        android:background="@color/kbs_logo_blue" >
-        android:textColor="@color/white"
+
-        android:layout_centerInParent="true"/>
+        <ImageView
-</RelativeLayout>
+            android:id="@+id/btn_close_profile"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@android:drawable/ic_menu_close_clear_cancel"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:padding="4dp"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            app:tint="@color/white"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Min Profil"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center_horizontal"
-        android:paddingTop="32dp"> <ImageView
+        android:paddingTop="32dp">
-        android:id="@+id/profile_image"
+
-        android:layout_width="120dp"
+        <ImageView
-        android:layout_height="120dp"
+            android:id="@+id/profile_image"
-        android:src="@android:drawable/sym_def_app_icon"
+            android:layout_width="120dp"
-        android:background="@android:color/transparent"
+            android:layout_height="120dp"
-        android:layout_marginBottom="24dp"/>
+            android:src="@android:drawable/sym_def_app_icon"
+            android:background="@android:color/transparent"
+            android:layout_marginBottom="24dp"/>
 
         <TextView
             android:id="@+id/profile_name"
@@ -70,17 +76,28 @@
             android:textSize="14sp"
             android:textStyle="italic"
             android:textColor="@color/kbs_logo_blue"
-            android:background="@color/kbs_very_light_blue"  android:paddingHorizontal="12dp"
+            android:background="@color/kbs_very_light_blue"
+            android:paddingHorizontal="12dp"
             android:paddingVertical="4dp"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="48dp"/>
+            android:layout_marginBottom="32dp"/>
+
+        <Button
+            android:id="@+id/btn_update_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Oppdater mine opplysninger"
+            android:backgroundTint="@color/white"
+            android:textColor="@color/kbs_logo_blue"
+            android:layout_marginBottom="16dp"/>
 
         <Button
             android:id="@+id/btn_logout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Logg ut"
-            android:backgroundTint="@color/kbs_logo_accent_red"  android:textColor="@color/white"/>
+            android:backgroundTint="@color/kbs_logo_accent_red"
+            android:textColor="@color/white"/>
 
     </LinearLayout>
 

app/src/main/res/navigation/mobile_navigation.xml

@@ -69,7 +69,7 @@
         android:id="@+id/navigation_forms_detail"
         android:name="com.kbs.kbsintranett.FormsFragment"
         android:label="Fyll ut skjema"
-        tools:layout="@layout/fragment_forms" >
+        tools:layout="@layout/fragment_forms">
         <argument
             android:name="formId"
             app:argType="integer"
@@ -101,6 +101,10 @@
         <action
             android:id="@+id/action_handbook_to_detail"
             app:destination="@id/navigation_handbook_detail" />
+
+        <action
+            android:id="@+id/action_handbook_to_form"
+            app:destination="@id/navigation_forms_detail" />
     </fragment>
 
     <fragment
@@ -113,6 +117,9 @@
             app:destination="@id/navigation_login"
             app:popUpTo="@id/navigation_home"
             app:popUpToInclusive="true" />
+        <action
+            android:id="@+id/action_profile_to_form"
+            app:destination="@id/navigation_forms_detail" />
     </fragment>
 
 </navigation>