diff --git a/app/src/main/java/com/kbs/kbsintranett/HandbookDetailFragment.java b/app/src/main/java/com/kbs/kbsintranett/HandbookDetailFragment.java
index 002d3a3..628e1b1 100644
--- a/app/src/main/java/com/kbs/kbsintranett/HandbookDetailFragment.java
+++ b/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 TextView titleView;
- private TextView contentView;
+ private String pageTitle;
+ private WebView webView;
private ProgressBar progressBar;
+ // --- CSS: DESIGN MED MER LUFT ---
+ private static final String CSS_STYLE =
+ "";
+
+ // --- JAVASCRIPT: AUTOSCROLL ---
+ private static final String JS_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);
- contentView = view.findViewById(R.id.detail_content);
+ webView = view.findViewById(R.id.detail_webview);
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() {
+ @Override
+ public void onResponse(Call call, Response 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 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() {
@Override
public void onResponse(Call call, Response 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
- // HtmlCompat.FROM_HTML_MODE_COMPACT håndterer grunnleggende tags (p, br, b, i, h1-h6, ul, li)
- // Det støtter dessverre ikke tabeller eller bilder optimalt rett i TextView.
- 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.");
+ if (getView() != null) {
+ Toolbar toolbar = getView().findViewById(R.id.detail_toolbar);
+ if (toolbar != null) toolbar.setTitle(page.title);
}
+
+ String htmlContent = "" +
+ "" +
+ CSS_STYLE +
+ JS_SCRIPT +
+ "";
+
+ htmlContent += "" + page.title + "
";
+
+ if (page.content != null) {
+ htmlContent += page.content;
+ } else {
+ htmlContent += "Ingen innhold funnet.
";
+ }
+ htmlContent += "";
+
+ webView.loadDataWithBaseURL("https://intranet.kbs.no", htmlContent, "text/html", "UTF-8", null);
+
} else {
Toast.makeText(getContext(), "Kunne ikke laste innhold.", Toast.LENGTH_SHORT).show();
}
diff --git a/app/src/main/java/com/kbs/kbsintranett/ProfileFragment.java b/app/src/main/java/com/kbs/kbsintranett/ProfileFragment.java
index a43ca41..42afa4f 100644
--- a/app/src/main/java/com/kbs/kbsintranett/ProfileFragment.java
+++ b/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;
diff --git a/app/src/main/res/layout/fragment_handbook.xml b/app/src/main/res/layout/fragment_handbook.xml
index 0de1f1c..9e9d68e 100644
--- a/app/src/main/res/layout/fragment_handbook.xml
+++ b/app/src/main/res/layout/fragment_handbook.xml
@@ -22,6 +22,15 @@
android:textColor="#333333"
android:layout_marginBottom="12dp"/>
+
+
-
-
+
+
+ android:layout_centerInParent="true"
+ android:visibility="gone"/>
-
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 2787143..88b0178 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/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">
+ android:background="@color/kbs_very_light_blue">
-
-
+ android:layout_marginBottom="32dp"
+ android:paddingHorizontal="10dp"
+ android:background="@color/kbs_logo_blue" >
+
+
+
+
+
+ android:paddingTop="32dp">
+
+
+ android:layout_marginBottom="32dp"/>
+
+
+ android:backgroundTint="@color/kbs_logo_accent_red"
+ android:textColor="@color/white"/>
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 598b6b7..8136961 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/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">
+
+
+
\ No newline at end of file
diff --git a/hele_prosjektet.txt b/hele_prosjektet.txt
index ccccb26..fbec233 100644
--- a/hele_prosjektet.txt
+++ b/hele_prosjektet.txt
@@ -47,14 +47,12 @@ plugins {
android {
namespace = "com.kbs.kbsintranett"
- compileSdk {
- version = release(36)
- }
+ compileSdk = 34
defaultConfig {
applicationId = "com.kbs.kbsintranett"
minSdk = 28
- targetSdk = 36
+ targetSdk = 34
versionCode = 1
versionName = "1.0"
@@ -71,6 +69,7 @@ android {
}
}
compileOptions {
+ // ENDRET: Oppgradert til Java 11 for å fikse build warnings
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
@@ -90,8 +89,8 @@ dependencies {
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.google.code.gson:gson:2.10.1")
- // Navigation Component (KORRIGERT FOR KOTLIN DSL)
- val navVersion = "2.8.5" // Oppdatert til en nyere, stabil versjon
+ // Navigation Component
+ val navVersion = "2.8.5"
implementation("androidx.navigation:navigation-fragment:$navVersion")
implementation("androidx.navigation:navigation-ui:$navVersion")
@@ -100,6 +99,9 @@ dependencies {
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
implementation("androidx.work:work-runtime:2.9.0")
+
+ // Swipe Refresh Layout
+ implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
}
============================================================
@@ -162,28 +164,18 @@ FILSTI: app\src\main\AndroidManifest.xml
============================================================
+ xmlns:tools="http://schemas.android.com/tools">
-
-
-
-
+
+
-
-
-
-
+
+
{
+ fetchFormsList();
+ });
+
+ // Hent data første gang
fetchFormsList();
return view;
}
private void fetchFormsList() {
- RetrofitClient.getApiService().getFormsListMap().enqueue(new Callback>() {
+ // Skjul feilmelding før ny henting
+ if (errorText != null) errorText.setVisibility(View.GONE);
+
+ RetrofitClient.getApiService().getFormsList().enqueue(new Callback>() {
@Override
- public void onResponse(Call> call, Response> response) {
+ public void onResponse(Call> call, Response> response) {
if (!isAdded()) return;
+
+ // Stopp lasting-indikatorer
progressBar.setVisibility(View.GONE);
+ swipeRefreshLayout.setRefreshing(false);
if (response.isSuccessful() && response.body() != null) {
+ List allForms = response.body();
List activeForms = new ArrayList<>();
- for (GravityForm form : response.body().values()) {
- // 1. Sjekk om skjemaet er aktivt (Bruker nå metoden i GravityForm)
+ for (GravityForm form : allForms) {
if (form.getIsActive()) {
+ // NYTT: Hardkodet filtrering av skjemaer som ikke skal vises i listen
+ // ID 10 = HMS-bekreftelse (Skal ligge i Håndbok/separat flyt)
+ // ID 18 = Refusjon-vedlegg (Er et underskjema som brukes av ID 16)
+ if (form.id == 10 || form.id == 18) {
+ continue;
+ }
+
activeForms.add(form);
}
}
- // 2. Sorter basert på tallet i tittelen
Collections.sort(activeForms, new Comparator() {
@Override
public int compare(GravityForm f1, GravityForm f2) {
@@ -2812,22 +2828,25 @@ public class FormsListFragment extends Fragment {
return Integer.compare(num1, num2);
}
});
-
populateList(activeForms);
} else {
String msg = "Kunne ikke hente skjemaer. Kode: " + response.code();
if (response.code() == 401 || response.code() == 403) {
- msg += "\n(Mangler tilgang. Er du admin?)";
+ msg += "\n(Mangler tilgang. Prøv å logge ut og inn igjen.)";
}
showError(msg);
}
}
@Override
- public void onFailure(Call> call, Throwable t) {
+ public void onFailure(Call> call, Throwable t) {
if (!isAdded()) return;
+
+ // Stopp lasting-indikatorer
progressBar.setVisibility(View.GONE);
+ swipeRefreshLayout.setRefreshing(false);
+
showError("Nettverksfeil: " + t.getMessage());
}
});
@@ -2842,7 +2861,6 @@ public class FormsListFragment extends Fragment {
}
for (GravityForm form : forms) {
- // FIX: form.id er allerede en int i GravityForm.java, så vi trenger ikke parse
int formId = form.id;
String cleanTitle = cleanTitle(form.title);
addFormButton(formsContainer, cleanTitle, formId);
@@ -2873,6 +2891,7 @@ public class FormsListFragment extends Fragment {
private void showError(String message) {
if (formsContainer == null) return;
formsContainer.removeAllViews();
+
TextView tv = new TextView(getContext());
tv.setText(message);
tv.setTextColor(Color.RED);
@@ -3061,19 +3080,359 @@ public class GravityForm {
}
============================================================
-FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookFragment.java
+FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookAdapter.java
============================================================
+// FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookAdapter.java
package com.kbs.kbsintranett;
-import androidx.fragment.app.Fragment; // Viktig import!
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.List;
+
+public class HandbookAdapter extends RecyclerView.Adapter {
+
+ private List fullList;
+ private List filteredList;
+ private OnItemClickListener listener;
+
+ public interface OnItemClickListener {
+ void onItemClick(HandbookItem item);
+ }
+
+ public HandbookAdapter(List items, OnItemClickListener listener) {
+ this.fullList = items;
+ this.filteredList = new ArrayList<>(items);
+ this.listener = listener;
+ }
+
+ @NonNull
+ @Override
+ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_handbook, parent, false);
+ return new ViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+ HandbookItem item = filteredList.get(position);
+ holder.title.setText(item.getTitle());
+
+ // Håndter ingress: Kutt etter 80 tegn hvis den er veldig lang
+ String desc = item.getDescription();
+ if (desc == null) desc = "";
+ if (desc.length() > 100) {
+ desc = desc.substring(0, 100) + "...";
+ }
+ holder.desc.setText(desc);
+
+ // Mapp ikon-type til ressurs (Utvidet liste fra PHP v3.0)
+ int iconRes = R.drawable.ic_handbook_general; // Fallback
+ String type = item.getIconType() != null ? item.getIconType() : "";
+
+ switch (type) {
+ case "car": iconRes = R.drawable.ic_handbook_car; break;
+ case "health": iconRes = R.drawable.ic_handbook_health; break;
+ case "people": iconRes = R.drawable.ic_handbook_people; break;
+ case "warning": iconRes = R.drawable.ic_handbook_warning; break;
+ case "doc": iconRes = R.drawable.ic_handbook_doc; break;
+ case "card": iconRes = R.drawable.ic_handbook_doc; break; // Bruker doc inntil videre
+ case "computer": iconRes = R.drawable.ic_handbook_general; break;
+ case "calendar": iconRes = R.drawable.ic_handbook_general; break;
+ case "money": iconRes = R.drawable.ic_handbook_doc; break;
+ case "helmet": iconRes = R.drawable.ic_handbook_warning; break;
+ case "trash": iconRes = R.drawable.ic_handbook_general; break;
+ case "book": iconRes = R.drawable.ic_book; break; // Gjenbruk eksisterende ic_book
+ case "chat": iconRes = R.drawable.ic_handbook_people; break;
+ default: iconRes = R.drawable.ic_handbook_general; break;
+ }
+ holder.icon.setImageResource(iconRes);
+
+ holder.itemView.setOnClickListener(v -> listener.onItemClick(item));
+ }
+
+ @Override
+ public int getItemCount() {
+ return filteredList.size();
+ }
+
+ public void filter(String query) {
+ filteredList.clear();
+ if (query.isEmpty()) {
+ filteredList.addAll(fullList);
+ } else {
+ String q = query.toLowerCase();
+ for (HandbookItem item : fullList) {
+ if (item.getTitle().toLowerCase().contains(q) ||
+ (item.getDescription() != null && item.getDescription().toLowerCase().contains(q))) {
+ filteredList.add(item);
+ }
+ }
+ }
+ notifyDataSetChanged();
+ }
+
+ public static class ViewHolder extends RecyclerView.ViewHolder {
+ TextView title, desc;
+ ImageView icon;
+
+ public ViewHolder(View view) {
+ super(view);
+ title = view.findViewById(R.id.title);
+ desc = view.findViewById(R.id.desc);
+ icon = view.findViewById(R.id.icon);
+ }
+ }
+}
+
+============================================================
+FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookDetailFragment.java
+============================================================
+// FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookDetailFragment.java
+package com.kbs.kbsintranett;
+
+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.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 retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+public class HandbookDetailFragment extends Fragment {
+
+ private int pageId;
+ private String pageTitle; // Fallback tittel før lasting
+ private TextView titleView;
+ private TextView contentView;
+ private ProgressBar progressBar;
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ return inflater.inflate(R.layout.fragment_handbook_detail, container, false);
+ }
+
+ @Override
+ 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.setNavigationOnClickListener(v -> Navigation.findNavController(view).navigateUp());
+
+ titleView = view.findViewById(R.id.detail_title);
+ contentView = view.findViewById(R.id.detail_content);
+ progressBar = view.findViewById(R.id.detail_loading);
+
+ titleView.setText(pageTitle); // Sett midlertidig tittel
+
+ fetchContent();
+ }
+
+ private void fetchContent() {
+ progressBar.setVisibility(View.VISIBLE);
+
+ RetrofitClient.getApiService().getHandbookPage(pageId).enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (!isAdded()) return;
+ progressBar.setVisibility(View.GONE);
+
+ if (response.isSuccessful() && response.body() != null) {
+ HandbookPage page = response.body();
+ titleView.setText(page.title);
+
+ // RENDERING AV HTML
+ // HtmlCompat.FROM_HTML_MODE_COMPACT håndterer grunnleggende tags (p, br, b, i, h1-h6, ul, li)
+ // Det støtter dessverre ikke tabeller eller bilder optimalt rett i TextView.
+ 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.");
+ }
+ } else {
+ Toast.makeText(getContext(), "Kunne ikke laste innhold.", Toast.LENGTH_SHORT).show();
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ if (!isAdded()) return;
+ progressBar.setVisibility(View.GONE);
+ Toast.makeText(getContext(), "Nettverksfeil", Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+}
+
+============================================================
+FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookFragment.java
+============================================================
+// FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookFragment.java
+package com.kbs.kbsintranett;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation; // Viktig
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
public class HandbookFragment extends Fragment {
- // Tomt innhold er OK, men klassen må hete det samme som filnavnet
- // og den må arve fra (extends) Fragment.
- public HandbookFragment() {
- super(R.layout.fragment_home); // Kobler til layouten automatisk
+ private RecyclerView recyclerView;
+ private ProgressBar progressBar;
+ private EditText searchField;
+ private HandbookAdapter adapter;
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ return inflater.inflate(R.layout.fragment_handbook, container, false);
}
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ recyclerView = view.findViewById(R.id.recycler_handbook);
+ progressBar = view.findViewById(R.id.progressBar);
+ searchField = view.findViewById(R.id.search_field);
+
+ recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
+
+ searchField.addTextChangedListener(new TextWatcher() {
+ @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+ @Override public void onTextChanged(CharSequence s, int start, int before, int count) {}
+ @Override public void afterTextChanged(Editable s) {
+ if (adapter != null) adapter.filter(s.toString());
+ }
+ });
+
+ fetchHandbook();
+ }
+
+ private void fetchHandbook() {
+ RetrofitClient.getApiService().getHandbookItems().enqueue(new Callback>() {
+ @Override
+ public void onResponse(Call> call, Response> response) {
+ if (!isAdded()) return;
+ progressBar.setVisibility(View.GONE);
+
+ if (response.isSuccessful() && response.body() != null) {
+ adapter = new HandbookAdapter(response.body(), item -> {
+ // NYTT: Naviger til Native Detail Fragment
+ Bundle bundle = new Bundle();
+ bundle.putInt("page_id", item.getId());
+ bundle.putString("page_title", item.getTitle());
+
+ Navigation.findNavController(getView())
+ .navigate(R.id.action_handbook_to_detail, bundle);
+ });
+ recyclerView.setAdapter(adapter);
+ } else {
+ String msg = "Kunne ikke laste håndboken. Kode: " + response.code();
+ if (response.code() == 404) msg += "\n(Fant ikke foreldresiden 'interninstruks-hms')";
+ Toast.makeText(getContext(), msg, Toast.LENGTH_LONG).show();
+ }
+ }
+
+ @Override
+ public void onFailure(Call> call, Throwable t) {
+ if (!isAdded()) return;
+ progressBar.setVisibility(View.GONE);
+ Toast.makeText(getContext(), "Nettverksfeil", Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+}
+
+============================================================
+FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookItem.java
+============================================================
+// FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookItem.java
+package com.kbs.kbsintranett;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+
+public class HandbookItem implements Serializable {
+ @SerializedName("id")
+ private int id; // NYTT
+
+ @SerializedName("title")
+ private String title;
+
+ @SerializedName("desc")
+ private String description;
+
+ @SerializedName("icon_type")
+ private String iconType;
+
+ @SerializedName("url")
+ private String url;
+
+ public int getId() { return id; }
+ public String getTitle() { return title; }
+ public String getDescription() { return description; }
+ public String getIconType() { return iconType; }
+ public String getUrl() { return url; }
+}
+
+============================================================
+FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookPage.java
+============================================================
+// FILSTI: app\src\main\java\com\kbs\kbsintranett\HandbookPage.java
+package com.kbs.kbsintranett;
+
+import com.google.gson.annotations.SerializedName;
+
+public class HandbookPage {
+ @SerializedName("id")
+ public int id;
+
+ @SerializedName("title")
+ public String title;
+
+ @SerializedName("content")
+ public String content; // Dette er HTML-strengen
}
============================================================
@@ -3349,6 +3708,150 @@ public class InputsAdapter implements JsonDeserializer> {
}
}
+============================================================
+FILSTI: app\src\main\java\com\kbs\kbsintranett\InternalLinkMovementMethod.java
+============================================================
+// FILSTI: app\src\main\java\com\kbs\kbsintranett\InternalLinkMovementMethod.java
+package com.kbs.kbsintranett;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle; // <-- Sjekk at denne er med!
+import android.text.Spannable;
+import android.text.method.LinkMovementMethod;
+import android.text.style.URLSpan;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+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;
+
+public class InternalLinkMovementMethod extends LinkMovementMethod {
+ private static InternalLinkMovementMethod instance;
+ private static final String TAG = "InternalLinkMethod";
+
+ public static InternalLinkMovementMethod getInstance() {
+ if (instance == null) instance = new InternalLinkMovementMethod();
+ return instance;
+ }
+
+ @Override
+ public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
+ int action = event.getAction();
+
+ if (action == MotionEvent.ACTION_UP) {
+ int x = (int) event.getX();
+ int y = (int) event.getY();
+
+ x -= widget.getTotalPaddingLeft();
+ y -= widget.getTotalPaddingTop();
+
+ x += widget.getScrollX();
+ y += widget.getScrollY();
+
+ int line = widget.getLayout().getLineForVertical(y);
+ int off = widget.getLayout().getOffsetForHorizontal(line, x);
+
+ URLSpan[] link = buffer.getSpans(off, off, URLSpan.class);
+ if (link.length != 0) {
+ String url = link[0].getURL();
+ handleLink(widget.getContext(), url, widget);
+ return true;
+ }
+ }
+ return super.onTouchEvent(widget, buffer, event);
+ }
+
+ private void handleLink(Context context, String url, View view) {
+ Log.d(TAG, "Link clicked: " + url);
+
+ // 1. Sjekk om det er en intern lenke
+ if (url.contains("intranet.kbs.no") || url.startsWith("/")) {
+
+ // a) Prøv å finne ID hvis den finnes i URLen (?p=123)
+ int pageId = extractIdFromUrl(url);
+
+ if (pageId > 0) {
+ navigateToInternalPage(view, pageId, "Laster...");
+ } else {
+ // b) Det er en "pen" URL. Vi må spørre APIet hva IDen er.
+ // Vi bruker Toast for å gi feedback om at noe skjer
+ Toast.makeText(context, "Åpner side...", Toast.LENGTH_SHORT).show();
+
+ RetrofitClient.getApiService().lookupPageId(url).enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (response.isSuccessful() && response.body() != null) {
+ int id = response.body().get("id").getAsInt();
+ if (id > 0) {
+ // Suksess! Naviger internt
+ navigateToInternalPage(view, id, "Laster...");
+ } else {
+ // Fant ikke ID, åpne i WebView som fallback
+ openInWebView(context, url);
+ }
+ } else {
+ openInWebView(context, url);
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ openInWebView(context, url);
+ }
+ });
+ }
+ } else {
+ // Ekstern lenke - åpne i nettleser
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ context.startActivity(browserIntent);
+ }
+ }
+
+ 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 navigateToInternalPage(View view, int pageId, String title) {
+ try {
+ Bundle bundle = new Bundle();
+ bundle.putInt("page_id", pageId);
+ bundle.putString("page_title", title);
+ Navigation.findNavController(view).navigate(R.id.action_handbook_to_detail, bundle);
+ } catch (Exception e) {
+ Log.e(TAG, "Kunne ikke navigere", e);
+ }
+ }
+
+ private void openInWebView(Context context, String url) {
+ Intent intent = new Intent(context, WebViewActivity.class);
+ intent.putExtra(WebViewActivity.EXTRA_URL, url);
+ intent.putExtra(WebViewActivity.EXTRA_TITLE, "KBS Intranett");
+ context.startActivity(intent);
+ }
+}
+
============================================================
FILSTI: app\src\main\java\com\kbs\kbsintranett\LoginFragment.java
============================================================
@@ -4367,12 +4870,71 @@ public class UserManager {
}
}
+============================================================
+FILSTI: app\src\main\java\com\kbs\kbsintranett\WebViewActivity.java
+============================================================
+package com.kbs.kbsintranett;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.webkit.CookieManager;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+public class WebViewActivity extends AppCompatActivity {
+
+ public static final String EXTRA_URL = "extra_url";
+ public static final String EXTRA_TITLE = "extra_title";
+
+ @SuppressLint("SetJavaScriptEnabled")
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_webview);
+
+ String url = getIntent().getStringExtra(EXTRA_URL);
+ String title = getIntent().getStringExtra(EXTRA_TITLE);
+
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ toolbar.setTitle(title != null ? title : "Håndbok");
+ toolbar.setNavigationIcon(android.R.drawable.ic_menu_revert);
+ toolbar.setNavigationOnClickListener(v -> finish());
+
+ WebView webView = findViewById(R.id.webview);
+ WebSettings settings = webView.getSettings();
+ settings.setJavaScriptEnabled(true);
+ settings.setDomStorageEnabled(true);
+ settings.setBuiltInZoomControls(true);
+ settings.setDisplayZoomControls(false);
+
+ // --- MAGIEN SKJER HER: INJISER COOKIE ---
+ String cookie = UserManager.getInstance().getCookie();
+ if (cookie != null && !cookie.isEmpty()) {
+ CookieManager cookieManager = CookieManager.getInstance();
+ cookieManager.setAcceptCookie(true);
+ // Vi antar at domenet er intranet.kbs.no basert på APIet
+ cookieManager.setCookie("https://intranet.kbs.no", cookie);
+ }
+ // ----------------------------------------
+
+ webView.setWebViewClient(new WebViewClient()); // Åpne linker i samme WebView
+
+ if (url != null) {
+ webView.loadUrl(url);
+ }
+ }
+}
+
============================================================
FILSTI: app\src\main\java\com\kbs\kbsintranett\WordPressApiService.java
============================================================
package com.kbs.kbsintranett;
import com.google.gson.JsonElement;
+import com.google.gson.JsonObject; // NY IMPORT
import java.util.List;
import java.util.Map;
import okhttp3.MultipartBody;
@@ -4388,27 +4950,21 @@ import retrofit2.http.PartMap;
import retrofit2.http.Query;
public interface WordPressApiService {
- // 1. Hent nyheter - ENDRET: Lagt til &_embed for å få bilde og kategori
@GET("wp-json/wp/v2/posts?per_page=10&_embed")
Call> getPosts();
- // 2. Hent et spesifikt skjema med ID
- @GET("wp-json/gf/v2/forms/{id}")
+ @GET("wp-json/kbs/v1/forms/{id}")
Call getForm(@Path("id") int formId);
- // 3. SEND INN SKJEMA (JSON-data uten filer)
@POST("wp-json/gf/v2/forms/{id}/submissions")
Call submitForm(@Path("id") int formId, @Body FormSubmission submission);
- // 4. LOGIN MED GOOGLE
@POST("wp-json/kbs/v1/login")
Call googleLogin(@Body LoginRequest request);
- // 5. HENT LISTE AV SKJEMAER
- @GET("wp-json/gf/v2/forms")
- Call> getFormsListMap();
+ @GET("wp-json/kbs/v1/forms")
+ Call> getFormsList();
- // 6. SEND INN SKJEMA (MULTIPART - for filopplasting)
@Multipart
@POST("wp-json/gf/v2/forms/{id}/submissions")
Call submitMultipartForm(
@@ -4417,11 +4973,9 @@ public interface WordPressApiService {
@Part List files
);
- // 7. HENT KALENDERHENDELSER
@GET("wp-json/kbs/v1/calendar/events")
Call> getCalendarEvents();
- // 8. HENT INNSENDINGER (Entries) - LISTE
@GET("wp-json/gf/v2/entries")
Call getEntries(
@Query("form_ids") int formId,
@@ -4429,13 +4983,21 @@ public interface WordPressApiService {
@Query("paging[page_size]") int pageSize
);
- // 9. HENT ÉN ENKELT INNSENDING
@GET("wp-json/gf/v2/entries/{entry_id}")
Call getSingleEntry(@Path("entry_id") String entryId);
- // 10. HENT ALLE NYHETER (F.eks 50 stk) - Brukes av "Se alle" siden
@GET("wp-json/wp/v2/posts?per_page=50&_embed")
Call> getAllPosts();
+
+ @GET("wp-json/kbs/v1/handbook")
+ Call> getHandbookItems();
+
+ @GET("wp-json/kbs/v1/handbook/{id}")
+ Call getHandbookPage(@Path("id") int id);
+
+ // NY: Slå opp ID fra URL
+ @GET("wp-json/kbs/v1/lookup-id")
+ Call lookupPageId(@Query("url") String url);
}
============================================================
@@ -4587,6 +5149,78 @@ FILSTI: app\src\main\res\drawable\ic_form.xml
+============================================================
+FILSTI: app\src\main\res\drawable\ic_handbook_car.xml
+============================================================
+
+
+
+
+============================================================
+FILSTI: app\src\main\res\drawable\ic_handbook_doc.xml
+============================================================
+
+
+
+
+============================================================
+FILSTI: app\src\main\res\drawable\ic_handbook_general.xml
+============================================================
+
+
+
+
+============================================================
+FILSTI: app\src\main\res\drawable\ic_handbook_health.xml
+============================================================
+
+
+
+
+============================================================
+FILSTI: app\src\main\res\drawable\ic_handbook_people.xml
+============================================================
+
+
+
+
+============================================================
+FILSTI: app\src\main\res\drawable\ic_handbook_warning.xml
+============================================================
+
+
+
+
============================================================
FILSTI: app\src\main\res\drawable\ic_home.xml
============================================================
@@ -4747,6 +5381,29 @@ FILSTI: app\src\main\res\layout\activity_main.xml
+============================================================
+FILSTI: app\src\main\res\layout\activity_webview.xml
+============================================================
+
+
+
+
+
+
+
+
============================================================
FILSTI: app\src\main\res\layout\bottom_sheet_calendar_details.xml
============================================================
@@ -4986,7 +5643,8 @@ FILSTI: app\src\main\res\layout\fragment_forms_list.xml
============================================================
-
-
-
+ android:layout_height="match_parent">
+
+
+
+
+
@@ -5019,16 +5684,118 @@ FILSTI: app\src\main\res\layout\fragment_forms_list.xml
FILSTI: app\src\main\res\layout\fragment_handbook.xml
============================================================
-
-
+
+
+
+
+
+
+
+
+
-
+ android:layout_marginTop="32dp"/>
+
+
+
+
+
+============================================================
+FILSTI: app\src\main\res\layout\fragment_handbook_detail.xml
+============================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
============================================================
FILSTI: app\src\main\res\layout\fragment_home.xml
@@ -5539,6 +6306,59 @@ FILSTI: app\src\main\res\layout\item_category.xml
android:textSize="14sp"
android:textStyle="bold" />
+============================================================
+FILSTI: app\src\main\res\layout\item_handbook.xml
+============================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
============================================================
FILSTI: app\src\main\res\layout\item_news.xml
============================================================
@@ -5698,15 +6518,12 @@ FILSTI: app\src\main\res\navigation\mobile_navigation.xml
android:name="com.kbs.kbsintranett.HomeFragment"
android:label="Hjem"
tools:layout="@layout/fragment_home">
-
-
-
@@ -5738,9 +6555,10 @@ FILSTI: app\src\main\res\navigation\mobile_navigation.xml
android:id="@+id/navigation_forms"
android:name="com.kbs.kbsintranett.FormsListFragment"
android:label="Skjemaer"
- tools:layout="@layout/fragment_forms_list">
+ tools:layout="@layout/fragment_forms_list">
+
+ tools:layout="@layout/fragment_handbook">
+
+
+
+
+
+
+
+
+