Update 23/01

.firebaserc

@@ -1,5 +0,0 @@
-{
-  "projects": {
-    "default": "gsi-hris-self-service"
-  }
-}

android/app/build.gradle

@@ -21,7 +21,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-//apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android/build.gradle

@@ -8,7 +8,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.14'
     }
 }
 

firebase.json

@@ -1,20 +0,0 @@
-{
-  "functions": [
-    {
-      "source": "functions",
-      "codebase": "default",
-      "ignore": [
-        "node_modules",
-        ".git",
-        "firebase-debug.log",
-        "firebase-debug.*.log"
-      ],
-      "predeploy": [
-        "npm --prefix \"$RESOURCE_DIR\" run lint"
-      ]
-    }
-  ],
-  "remoteconfig": {
-    "template": "remoteconfig.template.json"
-  }
-}

functions/.eslintrc.js

@@ -1,14 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    es6: true,
-    node: true,
-  },
-  extends: [
-    "eslint:recommended",
-    "google",
-  ],
-  rules: {
-    quotes: ["error", "double"],
-  },
-};

functions/.gitignore

@@ -1 +0,0 @@
-node_modules/

functions/index.js

@@ -1,9 +0,0 @@
-const functions = require("firebase-functions");
-
-// // Create and deploy your first functions
-// // https://firebase.google.com/docs/functions/get-started
-//
-// exports.helloWorld = functions.https.onRequest((request, response) => {
-//   functions.logger.info("Hello logs!", {structuredData: true});
-//   response.send("Hello from Firebase!");
-// });

functions/package.json

@@ -1,26 +0,0 @@
-{
-  "name": "functions",
-  "description": "Cloud Functions for Firebase",
-  "scripts": {
-    "lint": "eslint .",
-    "serve": "firebase emulators:start --only functions",
-    "shell": "firebase functions:shell",
-    "start": "npm run shell",
-    "deploy": "firebase deploy --only functions",
-    "logs": "firebase functions:log"
-  },
-  "engines": {
-    "node": "16"
-  },
-  "main": "index.js",
-  "dependencies": {
-    "firebase-admin": "^10.0.2",
-    "firebase-functions": "^3.18.0"
-  },
-  "devDependencies": {
-    "eslint": "^8.9.0",
-    "eslint-config-google": "^0.14.0",
-    "firebase-functions-test": "^0.2.0"
-  },
-  "private": true
-}

lib/Screens/Home/home_screen.dart

@@ -4,6 +4,7 @@ import 'dart:typed_data';
 import 'package:double_back_to_close/double_back_to_close.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
+import 'package:focus_detector/focus_detector.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/About/about_screen.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/Absensi/absensi_screen.dart';
@@ -17,7 +18,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:developer' as logDev;
 import '../Settings/RequestHttp/getDetail_post.dart';
 import '../Settings/RequestHttp/getProfileImage_post.dart';
-import 'package:location/location.dart';
 
 
 var _imageToShow;
@@ -35,15 +35,7 @@ class HomeView extends StatefulWidget {
   @override
   _HomeView createState() => _HomeView();
 }
-
-class _HomeView extends State<HomeView> {
-  @override
-  initState() {
-    getDetail();
-    _imageToShow = AssetImage('assets/images/ic_administrator.png');
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-     /* final location = await getLocation();
-      logDev.log("Location: ${location.latitude}, ${location.longitude}");*/
+/*WidgetsBinding.instance.addPostFrameCallback((_) async {
       ProgressDialog loading = ProgressDialog(context);
       loading = ProgressDialog(context,
           type: ProgressDialogType.normal,
@@ -67,7 +59,14 @@ class _HomeView extends State<HomeView> {
               fontWeight: FontWeight.w600));
       loading.show();
       _imageToShow = getProfileImage();
-    });
+    });*/
+
+class _HomeView extends State<HomeView> {
+  @override
+  initState() {
+    getDetail();
+    _imageToShow = AssetImage('assets/images/ic_administrator.png');
+    super.initState();
   }
 
   //Get Profile image
@@ -110,7 +109,7 @@ class _HomeView extends State<HomeView> {
             });
           } else if (photo != "false") {
             Uint8List decodedBytes = Base64Decoder().convert(photo);
-            logDev.log(decodedBytes.toString(), name: "DECODED BYTES photo");
+            //logDev.log(decodedBytes.toString(), name: "DECODED BYTES photo");
             setState(() {
               _imageToShow = Image
                   .memory(decodedBytes, gaplessPlayback: true)
@@ -210,224 +209,315 @@ class _HomeView extends State<HomeView> {
   }
 }
 
-class HomeScreen extends StatelessWidget {
+class HomeScreen extends StatefulWidget {
+  @override
+  State<HomeScreen> createState() => _HomeScreenState();
+}
+
+class _HomeScreenState extends State<HomeScreen> {
+  //Get Profile image
+  getProfileImage() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    final session = prefs.getString('session');
+
+    ProgressDialog loading = ProgressDialog(context);
+    loading = ProgressDialog(context,
+        type: ProgressDialogType.normal,
+        isDismissible: false,
+        showLogs: true);
+    loading.style(
+        message: 'Please Wait .....',
+        borderRadius: 5,
+        backgroundColor: Colors.white,
+        progressWidget: CircularProgressIndicator(),
+        elevation: 10.0,
+        padding: EdgeInsets.all(10),
+        insetAnimCurve: Curves.easeInOut,
+        progress: 0.0,
+        maxProgress: 100.0,
+        progressTextStyle: TextStyle(
+            color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
+        messageTextStyle: TextStyle(
+            color: Colors.black,
+            fontSize: 15.0,
+            fontWeight: FontWeight.w600));
+
+    loading.show();
+    GetProfileImage_Post.connectToAPI(session!).then((valueResult) async {
+      Map<String, dynamic> object = json.decode(valueResult);
+      if (object.containsKey("result").toString() == "true") {
+        String status = object['result']['status'].toString();
+        logDev.log(status, name: "STATUS GET PROFILE");
+        if (status == "success") {
+          String photo = object['result']['photo'].toString();
+          if (photo == "false") {
+            setState(() {
+              _imageToShow = AssetImage('assets/images/ic_administrator.png');
+            });
+          } else if (photo != "false") {
+            Uint8List decodedBytes = Base64Decoder().convert(photo);
+            //logDev.log(decodedBytes.toString(), name: "DECODED BYTES photo");
+            setState(() {
+              _imageToShow = Image
+                  .memory(decodedBytes, gaplessPlayback: true)
+                  .image;
+            });
+          }
+        } else if (status == "failed") {
+          String message = object['result']['message'].toString();
+          Fluttertoast.showToast(
+              msg: message,
+              toastLength: Toast.LENGTH_LONG,
+              gravity: ToastGravity.CENTER,
+              timeInSecForIosWeb: 1,
+              textColor: Colors.white,
+              fontSize: 16.0);
+        }
+        loading.hide();
+      } else {
+        Fluttertoast.showToast(
+            msg: "Server Response Error",
+            toastLength: Toast.LENGTH_SHORT,
+            gravity: ToastGravity.CENTER,
+            timeInSecForIosWeb: 1,
+            textColor: Colors.white,
+            fontSize: 16.0);
+        loading.hide();
+      }
+    });
+    return _imageToShow;
+  }
+
   @override
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
-    return Scaffold(
-        body: SingleChildScrollView(
-      child: Stack(
-        children: <Widget>[
-          Container(
-            height: size.height * 0.3,
-            decoration: BoxDecoration(
-                gradient: LinearGradient(
-                    begin: Alignment.topRight,
-                    end: Alignment.bottomRight,
-                    colors: [
-                  Color(0xFFD21404),
-                  Color(0xFFFD7267),
-                ])),
-          ),
-          SafeArea(
-            child: Padding(
-              padding: EdgeInsets.all(20),
-              child: Column(
-                children: <Widget>[
-                  Align(
-                    alignment: Alignment.topRight,
-                    child: InkWell(
-                      child: Container(
-                          alignment: Alignment.center,
-                          height: 40,
-                          width: 40,
-                          child: Image.asset('assets/images/ic_settings.png')),
-                      onTap: () {
-                        Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                                builder: (context) => SettingsScreen()));
-                      },
-                    ),
-                  ),
-                  Container(
-                    child:  Stack(
-                      alignment: Alignment.topLeft,
-                      children: [
-                        Container(
-                          margin: EdgeInsets.only(top: ((size.width - 20) * 0.33) * 0.5),
-                          child: Card(
-                            elevation: 15,
+    return FocusDetector(
+      onFocusLost: (){
+        getProfileImage();
+      },
+      onFocusGained: (){
+        getProfileImage();
+      },
+      onForegroundLost: (){
+        getProfileImage();
+      },
+      onForegroundGained: (){
+        getProfileImage();
+      },
+      child: Scaffold(
+          body: SingleChildScrollView(
+            child: Stack(
+              children: <Widget>[
+                Container(
+                  height: size.height * 0.3,
+                  decoration: BoxDecoration(
+                      gradient: LinearGradient(
+                          begin: Alignment.topRight,
+                          end: Alignment.bottomRight,
+                          colors: [
+                            Color(0xFFD21404),
+                            Color(0xFFFD7267),
+                          ])),
+                ),
+                SafeArea(
+                  child: Padding(
+                    padding: EdgeInsets.all(20),
+                    child: Column(
+                      children: <Widget>[
+                        Align(
+                          alignment: Alignment.topRight,
+                          child: InkWell(
                             child: Container(
-                                height: size.width * 0.35,
-                                width: size.width - 20,
-                                padding: EdgeInsets.all(15),
-                                decoration: BoxDecoration(
-                                    color: Colors.white,
-                                    borderRadius:
-                                    BorderRadius.all(Radius.circular(10))),
-                                child: Column(
-                                  mainAxisAlignment: MainAxisAlignment.end,
-                                  crossAxisAlignment: CrossAxisAlignment.center,
-                                  children: <Widget>[
-                                    Text(name,
-                                      maxLines: 2,
-                                      overflow: TextOverflow.ellipsis,
-                                      textAlign: TextAlign.center,
-                                      style: GoogleFonts.inter(
-                                          fontSize: 18,
-                                          color: Colors.black,
-                                          fontWeight: FontWeight.bold),
-                                    ),
-                                    Text(position,
-                                      textAlign: TextAlign.center,
-                                      style: GoogleFonts.inter(
-                                          fontSize: 17, color: Colors.black),
-                                    ),
-                                  ],
-                                )),
+                                alignment: Alignment.center,
+                                height: 40,
+                                width: 40,
+                                child: Image.asset('assets/images/ic_settings.png')),
+                            onTap: () {
+                              Navigator.push(
+                                  context,
+                                  MaterialPageRoute(
+                                      builder: (context) => SettingsScreen()));
+                            },
                           ),
                         ),
-                        Align(
-                          alignment: Alignment.topCenter,
-                          child: Container(
-                            margin: EdgeInsets.only(left: 15),
+                        Container(
+                          child:  Stack(
                             alignment: Alignment.topLeft,
-                            height: (size.width - 20) * 0.33,
-                            width: (size.width - 20) * 0.33,
-                            decoration: BoxDecoration(
-                              color: Colors.black,
-                              image: DecorationImage(
-                                image: _imageToShow,
-                                fit: BoxFit.fill,
-                              ),
-                              shape: BoxShape.circle,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  GridView.count(
-                    shrinkWrap: true,
-                    physics: NeverScrollableScrollPhysics(),
-                    padding: EdgeInsets.only(top: 25, left: 5, right: 5),
-                    crossAxisSpacing: 15,
-                    mainAxisSpacing: 15,
-                    crossAxisCount: 2,
-                    children: <Widget>[
-                      InkWell(
-                          child: Container(
-                            decoration: BoxDecoration(
-                                color: Color(0xFFD0D0D0),
-                                borderRadius: BorderRadius.circular(5)),
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: <Widget>[
-                                Container(
-                                  width: 75,
-                                  height: 75,
-                                  child: Image.asset(
-                                    "assets/icons/menu/ic_absensi.png",
-                                    fit: BoxFit.fill,
-                                    alignment: Alignment.center,
-                                  ),
-                                ),
-                                Container(
-                                  margin: EdgeInsets.only(top: 10),
-                                  padding: EdgeInsets.all(5),
-                                  child: Text(
-                                    'Attendance',
-                                    textAlign: TextAlign.center,
-                                    style: GoogleFonts.acme(
-                                        fontSize: 18, color: Colors.black),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                          onTap: () {
-                            Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                    builder: (context) => AbsensiScreen()));
-                          }),
-                      InkWell(
-                        child: Container(
-                          decoration: BoxDecoration(
-                              color: Color(0xFFD0D0D0),
-                              borderRadius: BorderRadius.circular(5)),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: <Widget>[
+                            children: [
                               Container(
-                                width: 75,
-                                height: 75,
-                                child: Image.asset(
-                                    "assets/icons/menu/ic_slipgaji_2.png",
-                                    fit: BoxFit.fill,
-                                    alignment: Alignment.center),
+                                margin: EdgeInsets.only(top: ((size.width - 20) * 0.33) * 0.5),
+                                child: Card(
+                                  elevation: 15,
+                                  child: Container(
+                                      height: size.width * 0.35,
+                                      width: size.width - 20,
+                                      padding: EdgeInsets.all(15),
+                                      decoration: BoxDecoration(
+                                          color: Colors.white,
+                                          borderRadius:
+                                          BorderRadius.all(Radius.circular(10))),
+                                      child: Column(
+                                        mainAxisAlignment: MainAxisAlignment.end,
+                                        crossAxisAlignment: CrossAxisAlignment.center,
+                                        children: <Widget>[
+                                          Text(name,
+                                            maxLines: 2,
+                                            overflow: TextOverflow.ellipsis,
+                                            textAlign: TextAlign.center,
+                                            style: GoogleFonts.inter(
+                                                fontSize: 18,
+                                                color: Colors.black,
+                                                fontWeight: FontWeight.bold),
+                                          ),
+                                          Text(position,
+                                            textAlign: TextAlign.center,
+                                            style: GoogleFonts.inter(
+                                                fontSize: 17, color: Colors.black),
+                                          ),
+                                        ],
+                                      )),
+                                ),
                               ),
-                              Container(
-                                margin: EdgeInsets.only(top: 10),
-                                padding: EdgeInsets.all(5),
-                                child: Text(
-                                  'Salary Slip',
-                                  textAlign: TextAlign.center,
-                                  style: GoogleFonts.acme(
-                                      fontSize: 18, color: Colors.black),
+                              Align(
+                                alignment: Alignment.topCenter,
+                                child: Container(
+                                  margin: EdgeInsets.only(left: 15),
+                                  alignment: Alignment.topLeft,
+                                  height: (size.width - 20) * 0.33,
+                                  width: (size.width - 20) * 0.33,
+                                  decoration: BoxDecoration(
+                                    color: Colors.black,
+                                    image: DecorationImage(
+                                      image: _imageToShow,
+                                      fit: BoxFit.fill,
+                                    ),
+                                    shape: BoxShape.circle,
+                                  ),
                                 ),
                               ),
                             ],
                           ),
                         ),
-                        onTap: () {
-                          Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                  builder: (context) => SlipGajiScreen()));
-                        },
-                      ),
-                      InkWell(
-                        child: Container(
-                          decoration: BoxDecoration(
-                              color: Color(0xFFD0D0D0),
-                              borderRadius: BorderRadius.circular(5)),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: <Widget>[
-                              Container(
-                                width: 70,
-                                height: 70,
-                                child: Image.asset(
-                                    "assets/icons/menu/ic_cuti_2.png",
-                                    fit: BoxFit.fill,
-                                    alignment: Alignment.center),
+                        GridView.count(
+                          shrinkWrap: true,
+                          physics: NeverScrollableScrollPhysics(),
+                          padding: EdgeInsets.only(top: 25, left: 5, right: 5),
+                          crossAxisSpacing: 15,
+                          mainAxisSpacing: 15,
+                          crossAxisCount: 2,
+                          children: <Widget>[
+                            InkWell(
+                                child: Container(
+                                  decoration: BoxDecoration(
+                                      color: Color(0xFFD0D0D0),
+                                      borderRadius: BorderRadius.circular(5)),
+                                  child: Column(
+                                    crossAxisAlignment: CrossAxisAlignment.center,
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: <Widget>[
+                                      Container(
+                                        width: 75,
+                                        height: 75,
+                                        child: Image.asset(
+                                          "assets/icons/menu/ic_absensi.png",
+                                          fit: BoxFit.fill,
+                                          alignment: Alignment.center,
+                                        ),
+                                      ),
+                                      Container(
+                                        margin: EdgeInsets.only(top: 10),
+                                        padding: EdgeInsets.all(5),
+                                        child: Text(
+                                          'Attendance',
+                                          textAlign: TextAlign.center,
+                                          style: GoogleFonts.acme(
+                                              fontSize: 18, color: Colors.black),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                onTap: () {
+                                  Navigator.push(
+                                      context,
+                                      MaterialPageRoute(
+                                          builder: (context) => AbsensiScreen()));
+                                }),
+                            InkWell(
+                              child: Container(
+                                decoration: BoxDecoration(
+                                    color: Color(0xFFD0D0D0),
+                                    borderRadius: BorderRadius.circular(5)),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: <Widget>[
+                                    Container(
+                                      width: 75,
+                                      height: 75,
+                                      child: Image.asset(
+                                          "assets/icons/menu/ic_slipgaji_2.png",
+                                          fit: BoxFit.fill,
+                                          alignment: Alignment.center),
+                                    ),
+                                    Container(
+                                      margin: EdgeInsets.only(top: 10),
+                                      padding: EdgeInsets.all(5),
+                                      child: Text(
+                                        'Pay Slip',
+                                        textAlign: TextAlign.center,
+                                        style: GoogleFonts.acme(
+                                            fontSize: 18, color: Colors.black),
+                                      ),
+                                    ),
+                                  ],
+                                ),
                               ),
-                              Container(
-                                margin: EdgeInsets.only(top: 10),
-                                padding: EdgeInsets.all(5),
-                                child: Text(
-                                  'Time Off Submission',
-                                  textAlign: TextAlign.center,
-                                  style: GoogleFonts.acme(
-                                      fontSize: 18, color: Colors.black),
+                              onTap: () {
+                                Navigator.push(
+                                    context,
+                                    MaterialPageRoute(
+                                        builder: (context) => SlipGajiScreen()));
+                              },
+                            ),
+                            InkWell(
+                              child: Container(
+                                decoration: BoxDecoration(
+                                    color: Color(0xFFD0D0D0),
+                                    borderRadius: BorderRadius.circular(5)),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: <Widget>[
+                                    Container(
+                                      width: 70,
+                                      height: 70,
+                                      child: Image.asset(
+                                          "assets/icons/menu/ic_cuti_2.png",
+                                          fit: BoxFit.fill,
+                                          alignment: Alignment.center),
+                                    ),
+                                    Container(
+                                      margin: EdgeInsets.only(top: 10),
+                                      padding: EdgeInsets.all(5),
+                                      child: Text(
+                                        'Time Off Submission',
+                                        textAlign: TextAlign.center,
+                                        style: GoogleFonts.acme(
+                                            fontSize: 18, color: Colors.black),
+                                      ),
+                                    ),
+                                  ],
                                 ),
                               ),
-                            ],
-                          ),
-                        ),
-                        onTap: () {
-                          Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                  builder: (context) => AjukanCutiScreen()));
-                        },
-                      ),
-                      /*InkWell(
+                              onTap: () {
+                                Navigator.push(
+                                    context,
+                                    MaterialPageRoute(
+                                        builder: (context) => AjukanCutiScreen()));
+                              },
+                            ),
+                            /*InkWell(
                         child: Container(
                           decoration: BoxDecoration(
                               color: Color(0xFFD0D0D0),
@@ -462,126 +552,127 @@ class HomeScreen extends StatelessWidget {
                                   builder: (context) => BeritaScreen()));
                         },
                       ),*/
-                      InkWell(
-                        child: Container(
-                          decoration: BoxDecoration(
-                              color: Color(0xFFD0D0D0),
-                              borderRadius: BorderRadius.circular(5)),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: <Widget>[
-                              Container(
-                                width: 70,
-                                height: 70,
-                                child: Image.asset(
-                                  "assets/icons/menu/ic_surattugas_2.png",
-                                  fit: BoxFit.fill,
-                                  alignment: Alignment.center,
-                                ),
-                              ),
-                              Container(
-                                margin: EdgeInsets.only(top: 10),
-                                padding: EdgeInsets.all(5),
-                                child: Text(
-                                  'Assignment Letter',
-                                  textAlign: TextAlign.center,
-                                  style: GoogleFonts.acme(
-                                      fontSize: 18, color: Colors.black),
+                            InkWell(
+                              child: Container(
+                                decoration: BoxDecoration(
+                                    color: Color(0xFFD0D0D0),
+                                    borderRadius: BorderRadius.circular(5)),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: <Widget>[
+                                    Container(
+                                      width: 70,
+                                      height: 70,
+                                      child: Image.asset(
+                                        "assets/icons/menu/ic_surattugas_2.png",
+                                        fit: BoxFit.fill,
+                                        alignment: Alignment.center,
+                                      ),
+                                    ),
+                                    Container(
+                                      margin: EdgeInsets.only(top: 10),
+                                      padding: EdgeInsets.all(5),
+                                      child: Text(
+                                        'Assignment Letter',
+                                        textAlign: TextAlign.center,
+                                        style: GoogleFonts.acme(
+                                            fontSize: 18, color: Colors.black),
+                                      ),
+                                    ),
+                                  ],
                                 ),
                               ),
-                            ],
-                          ),
-                        ),
-                        onTap: () {
-                          Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                  builder: (context) => SuratTugas_Screen()));
-                        },
-                      ),
-                      InkWell(
-                        child: Container(
-                          decoration: BoxDecoration(
-                              color: Color(0xFFD0D0D0),
-                              borderRadius: BorderRadius.circular(5)),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: <Widget>[
-                              Container(
-                                width: 70,
-                                height: 70,
-                                child: Image.asset(
-                                    "assets/icons/menu/ic_reimburse.png",
-                                    fit: BoxFit.fill,
-                                    alignment: Alignment.center),
-                              ),
-                              Container(
-                                margin: EdgeInsets.only(top: 10),
-                                padding: EdgeInsets.all(5),
-                                child: Text(
-                                  'Reimburse',
-                                  textAlign: TextAlign.center,
-                                  style: GoogleFonts.acme(
-                                      fontSize: 18, color: Colors.black),
+                              onTap: () {
+                                Navigator.push(
+                                    context,
+                                    MaterialPageRoute(
+                                        builder: (context) => SuratTugas_Screen()));
+                              },
+                            ),
+                            InkWell(
+                              child: Container(
+                                decoration: BoxDecoration(
+                                    color: Color(0xFFD0D0D0),
+                                    borderRadius: BorderRadius.circular(5)),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: <Widget>[
+                                    Container(
+                                      width: 70,
+                                      height: 70,
+                                      child: Image.asset(
+                                          "assets/icons/menu/ic_reimburse.png",
+                                          fit: BoxFit.fill,
+                                          alignment: Alignment.center),
+                                    ),
+                                    Container(
+                                      margin: EdgeInsets.only(top: 10),
+                                      padding: EdgeInsets.all(5),
+                                      child: Text(
+                                        'Reimburse',
+                                        textAlign: TextAlign.center,
+                                        style: GoogleFonts.acme(
+                                            fontSize: 18, color: Colors.black),
+                                      ),
+                                    ),
+                                  ],
                                 ),
                               ),
-                            ],
-                          ),
-                        ),
-                        onTap: () {
-                          Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                  builder: (context) => ReimburseScreen()));
-                        },
-                      ),
-                      InkWell(
-                        child: Container(
-                          decoration: BoxDecoration(
-                              color: Color(0xFFD0D0D0),
-                              borderRadius: BorderRadius.circular(5)),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: <Widget>[
-                              Container(
-                                width: 70,
-                                height: 70,
-                                child: Image.asset(
-                                    "assets/icons/menu/ic_about_2.png",
-                                    fit: BoxFit.fill,
-                                    alignment: Alignment.center),
-                              ),
-                              Container(
-                                margin: EdgeInsets.only(top: 10),
-                                padding: EdgeInsets.all(5),
-                                child: Text(
-                                  'About',
-                                  textAlign: TextAlign.center,
-                                  style: GoogleFonts.acme(
-                                      fontSize: 18, color: Colors.black),
+                              onTap: () {
+                                Navigator.push(
+                                    context,
+                                    MaterialPageRoute(
+                                        builder: (context) => ReimburseScreen()));
+                              },
+                            ),
+                            InkWell(
+                              child: Container(
+                                decoration: BoxDecoration(
+                                    color: Color(0xFFD0D0D0),
+                                    borderRadius: BorderRadius.circular(5)),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: <Widget>[
+                                    Container(
+                                      width: 70,
+                                      height: 70,
+                                      child: Image.asset(
+                                          "assets/icons/menu/ic_about_2.png",
+                                          fit: BoxFit.fill,
+                                          alignment: Alignment.center),
+                                    ),
+                                    Container(
+                                      margin: EdgeInsets.only(top: 10),
+                                      padding: EdgeInsets.all(5),
+                                      child: Text(
+                                        'About',
+                                        textAlign: TextAlign.center,
+                                        style: GoogleFonts.acme(
+                                            fontSize: 18, color: Colors.black),
+                                      ),
+                                    ),
+                                  ],
                                 ),
                               ),
-                            ],
-                          ),
-                        ),
-                        onTap: () {
-                          Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                  builder: (context) => AboutScreen()));
-                        },
-                      ),
-                    ],
-                  )
-                ],
-              ),
+                              onTap: () {
+                                Navigator.push(
+                                    context,
+                                    MaterialPageRoute(
+                                        builder: (context) => AboutScreen()));
+                              },
+                            ),
+                          ],
+                        )
+                      ],
+                    ),
+                  ),
+                ),
+              ],
             ),
-          ),
-        ],
-      ),
-    ));
+          )),
+    );
   }
 }

lib/Screens/Login/login_screen.dart

@@ -1,4 +1,6 @@
+import 'dart:async';
 import 'dart:convert';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_udid/flutter_udid.dart';
@@ -13,6 +15,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../Home/home_screen.dart';
 import 'inputWidget.dart';
 import 'dart:developer' as logDev;
+import 'package:plain_notification_token/plain_notification_token.dart';
+import 'dart:io' show Platform;
 
 class LoginView extends StatefulWidget {
   @override
@@ -20,6 +24,7 @@ class LoginView extends StatefulWidget {
 }
 
 class _LoginView extends State<LoginView> {
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -34,10 +39,43 @@ class _LoginView extends State<LoginView> {
   }
 }
 
-class LoginScreen extends StatelessWidget {
+class LoginScreen extends StatefulWidget {
+  @override
+  State<LoginScreen> createState() => _LoginScreenState();
+}
+
+class _LoginScreenState extends State<LoginScreen> {
   late LoginPostResult loginPostResult;
   String version = "1.0.0";
-  String notif_token = "ginro";
+  String notif_token = "";
+
+  String _pushToken = '0819';
+  IosNotificationSettings? _settings;
+  late StreamSubscription onTokenRefreshSubscription;
+
+  @override
+  void initState() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      getNotifToken();
+    });
+    super.initState();
+  }
+  
+  getNotifToken () async {
+    await Firebase.initializeApp();
+    final plainNotificationToken = PlainNotificationToken();
+    if (Platform.isIOS) {
+      plainNotificationToken.requestPermission();
+      await plainNotificationToken.onIosSettingsRegistered.first;
+    }
+    onTokenRefreshSubscription = PlainNotificationToken().onTokenRefresh.listen((token) {
+      setState(() {
+        _pushToken = token;
+      });
+    });
+    logDev.log(_pushToken, name: "Notif TOKEN");
+   /* final notif_token = await plainNotificationToken.onTokenRefresh.listen ((t));*/
+  }
 
   @override
   Widget build(BuildContext context) {

lib/Screens/Login/post_result_model.dart

@@ -1,15 +1,9 @@
 import 'dart:convert';
 import 'dart:core';
 import 'dart:io' show Platform;
-import 'package:device_imei/device_imei.dart';
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_udid/flutter_udid.dart';
 import 'package:http/http.dart' as http;
 import 'package:hris_selfservice_mobile/constants.dart';
 import 'dart:developer' as developer;
-import 'package:device_imei/device_imei.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 late String platformDevice;
 platform(){

lib/Screens/Menu/Reimburse/history_reimburse.dart

@@ -47,7 +47,6 @@ class _HistoryReimburse extends State<HistoryReimburse> {
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       getHistoryData();
     });
-    logDev.log(HistoryLength.toString(), name: "Banyak History");
   }
 
   getHistoryData() async {
@@ -181,7 +180,8 @@ class _HistoryReimburse extends State<HistoryReimburse> {
               ],
             ),
             Container(
-              margin: EdgeInsets.only(top: (MediaQuery.of(context).size.height / 6) + 40, left: 5, right: 5, bottom: 10),
+              margin: EdgeInsets.only(top: (MediaQuery.of(context).size.height / 6) + 40,
+                  left: 5, right: 5, bottom: 10),
               child: ListView.builder(
                 scrollDirection: Axis.vertical,
                 shrinkWrap: true,

lib/Screens/Menu/SlipGaji/RequestHttp/detailSlipGaji_post.dart

@@ -30,7 +30,7 @@ class DetailSlipGaji_Post {
       "Api-key": apiKey
     });
 
-    developer.log(sendData.body, name: "Get History Reimburse Result");
+    developer.log(sendData.body, name: "Detail Slip Gaji Result");
     return sendData.body;
   }
 }

lib/Screens/Menu/SlipGaji/slipgaji_screen.dart

@@ -1,14 +1,12 @@
 import 'dart:convert';
 
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/RequestHttp/detailSlipGaji_post.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/RequestHttp/historySlipGaji_post.dart';
 import 'package:hris_selfservice_mobile/Screens/Menu/SlipGaji/background.dart';
-import 'package:intl/date_symbol_data_local.dart';
 import 'package:progress_dialog_null_safe/progress_dialog_null_safe.dart';
 import 'dart:developer' as logDev;
 
@@ -22,10 +20,12 @@ class SlipGajiScreen extends StatefulWidget {
 }
 
 class _SlipGajiScreenState extends State<SlipGajiScreen> {
+  //History Slip Gaji
   late List <String> dateTo_List;
   late List <String> batchID_List;
 
   //Detail Slip Gaji
+  late List <String> number_List;
   late List <String> period_List;
   late List <String> namaPegawai_List;
   late List <String> status_List;
@@ -37,8 +37,8 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
   late List <String> category_List;
   late List <String> total_List;
 
-  late int HistoryLength;
-  late int DetailLength;
+  int HistoryLength = 0;
+  late int indexBatchID = 0;
 
   var selectedDate;
   bool visible = false;
@@ -49,41 +49,47 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
     dateTo_List = [""];
     batchID_List = [""];
 
+    number_List = [""];
+    period_List = [""];
+    namaPegawai_List = [""];
+    status_List = [""];
+    structure_List = [""];
+    position = "";
+
     name_List = [""];
     category_List = [""];
     total_List = [""];
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      ProgressDialog loading = ProgressDialog(context);
-      loading = ProgressDialog(context,
-          type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
-      loading.style(
-          message: 'Please Wait .....',
-          borderRadius: 3,
-          backgroundColor: Colors.white,
-          progressWidget: CircularProgressIndicator(),
-          elevation: 10.0,
-          padding: EdgeInsets.all(10),
-          insetAnimCurve: Curves.easeInOut,
-          progress: 0.0,
-          maxProgress: 100.0,
-          progressTextStyle: TextStyle(
-              color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
-          messageTextStyle: TextStyle(
-              color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
-      loading.show();
       getHistoryData();
-      loading.hide();
     });
   }
 
   getHistoryData() async {
+    ProgressDialog loading = ProgressDialog(context);
+    loading = ProgressDialog(context,
+        type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
+    loading.style(
+        message: 'Please Wait .....',
+        borderRadius: 3,
+        backgroundColor: Colors.white,
+        progressWidget: CircularProgressIndicator(),
+        elevation: 10.0,
+        padding: EdgeInsets.all(10),
+        insetAnimCurve: Curves.easeInOut,
+        progress: 0.0,
+        maxProgress: 100.0,
+        progressTextStyle: TextStyle(
+            color: Colors.black, fontSize: 10.0, fontWeight: FontWeight.w400),
+        messageTextStyle: TextStyle(
+            color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
+    loading.show();
     HistorySlipGaji_Post.connectToAPI().then((valueResult) async {
       Map<String, dynamic> object = json.decode(valueResult);
       if (object.containsKey("result").toString() == "true"){
         String result = object['result'].toString();
         if (result.contains("failed")) {
-          //loading.hide();
+          loading.hide();
           setState(() {
             alertDialogFailedRetrievedData(context);
           });
@@ -94,7 +100,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
               String dateTo = historySlipGaji[i]['date_to'].toString();
               String bulan = dateTo.substring(5,7);
               String tahun = dateTo.substring(0,4);
-              String batchID = historySlipGaji[i][''].toString();
+              String batchID = historySlipGaji[i]['batch_id'].toString();
 
               String bulanStr = "";
               if (bulan == "01"){
@@ -126,6 +132,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
               String bulanTahun = bulanStr + " " + tahun;
               dateTo_List.add(bulanTahun);
               batchID_List.add(batchID);
+
             }
             dateTo_List.removeAt(0);
             batchID_List.removeAt(0);
@@ -133,7 +140,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
             HistoryLength = historySlipGaji.length;
 
           });
-          //loading.hide();
+          loading.hide();
         }
       } else {
         setState((){
@@ -146,10 +153,10 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
               textColor: Colors.white,
               fontSize: 16.0);
         });
-        //loading.hide();
+        loading.hide();
       }
     });
-
+    return HistoryLength;
   }
 
   getDetailData () async {
@@ -172,60 +179,75 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
     loading.show();
 
+    //logDev.log(batchID_List.toString(), name: "ALL BATCH ID");
+
     final SharedPreferences prefs = await SharedPreferences.getInstance();
-    for (int i = 0; i < HistoryLength; i++){
-      DetailSlipGaji_Post.connectToAPI(batchID_List[i]).then((valueResult) async {
+      DetailSlipGaji_Post.connectToAPI(batchID_List[indexBatchID]).then((valueResult) async {
         Map<String, dynamic> object = json.decode(valueResult);
         if (object.containsKey("result").toString() == "true"){
           String result = object['result'].toString();
           if (result.contains("failed")) {
             loading.hide();
+            logDev.log("ERROR", name: "FAILED RESULT");
             setState(() {
               alertDialogFailedRetrievedData(context);
             });
           } else {
-            List <dynamic> detailSlipGaji = object['result'];
+            //List <dynamic> detailSlipGaji = object['result'];
             setState(() {
               position = prefs.getString('position')!;
-              for (int k = 0; k < detailSlipGaji.length; k++){
-                String tanggalAwal = detailSlipGaji[k]['date_from'].toString();
-                String tanggalAkhir = detailSlipGaji[k]['date_to'].toString();
-                String namaPegawai = detailSlipGaji[k]['employee'].toString();
-                String status = detailSlipGaji[i]['status'].toString();
-                String structure = detailSlipGaji[i]['structure'].toString();
-                List <dynamic> component = object['result']['component'];
-                for (int j = 0; j < component.length; j++){
-                  String name = component[j]['name'].toString();
-                  String category = component[j]['category'].toString();
-                  String total = component[j]['total'].toString();
-
-                  name_List.add(name);
-                  category_List.add(category);
-                  total_List.add(total);
-                }
-
-                period_List.add(tanggalAwal + " - " + tanggalAkhir);
-                namaPegawai_List.add(namaPegawai);
-                status_List.add(status);
+              String nomor = object['result']['number'];
+              String tanggalAwal = object['result']['date_from'];
+              String tanggalAkhir = object['result']['date_to'];
+              String namaPegawai = object['result']['employee'];
+              String status = object['result']['status'];
+              String structure =object['result']['structure'];
+              number_List.add(nomor);
+              structure_List.add(structure);
+              period_List.add(tanggalAwal + " to " + tanggalAkhir);
+              namaPegawai_List.add(namaPegawai);
+              status_List.add(status);
+
+              List <dynamic> component = object['result']['component'];
+              logDev.log(component.length.toString(), name: "BANYAK COMPONENT");
+              for (int j = 0; j < component.length; j++){
+                String name = component[j]['name'].toString();
+                String category = component[j]['category'].toString();
+                int total = component[j]['total'];
+
+                name_List.add(name);
+                category_List.add(category);
+                total_List.add(total.toString());
               }
+
+              number_List.remove(0);
+              structure_List.removeAt(0);
+              period_List.removeAt(0);
+              namaPegawai_List.removeAt(0);
+              status_List.removeAt(0);
+
+              name_List.removeAt(0);
+              category_List.removeAt(0);
+              total_List.removeAt(0);
             });
             loading.hide();
           }
         } else {
           setState((){
             alertDialogFailedResponse(context);
-            Fluttertoast.showToast(
+            logDev.log("ERROR", name: "RESPONSE FAILED RESULT");
+           /* Fluttertoast.showToast(
                 msg: "Server Response Error",
                 toastLength: Toast.LENGTH_SHORT,
                 gravity: ToastGravity.CENTER,
                 timeInSecForIosWeb: 1,
                 textColor: Colors.white,
-                fontSize: 16.0);
+                fontSize: 16.0);*/
           });
           loading.hide();
         }
       });
-    }
+
   }
 
   @override
@@ -245,7 +267,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                   crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
                     Text(
-                      'Salary Slip\t\t',
+                      'Pay Slip\t\t',
                       maxLines: 1,
                       style: GoogleFonts.luckiestGuy(
                         fontSize: 28,
@@ -297,6 +319,14 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                                       selectedDate = value!;
                                       if (selectedDate == value){
                                         visible = true;
+                                        for (int i = 0; i < dateTo_List.length; i ++){
+                                          if (selectedDate == dateTo_List[i]){
+                                            indexBatchID = i;
+                                            break;
+                                          }
+                                        }
+                                        //logDev.log(indexBatchID.toString(), name: "INDEX BATCH ID");
+                                        getDetailData();
                                       } else {
                                         visible = false;
                                       }
@@ -317,7 +347,7 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                     Visibility(
                       visible: visible,
                       child: Text(
-                        'Salary Slip ' + selectedDate.toString() + "\nPT. Global Service Indonesia",
+                        'Pay Slip ' + selectedDate.toString() + "\nPT. Global Service Indonesia",
                         textAlign: TextAlign.center,
                         style: GoogleFonts.viga(
                           fontSize: 15,
@@ -327,18 +357,34 @@ class _SlipGajiScreenState extends State<SlipGajiScreen> {
                     ),
                     Visibility(
                         visible: visible,
-                        child: Container(
-                          height: 200,
-                          child: Card(
-                            elevation: 7,
-                            child: Container(
-                                decoration: BoxDecoration(
-                                    color: Color(0XFFFFFEFC),
-                                    borderRadius: BorderRadius.circular(10)
-                                )
-                            ),
-                          ),
-                        )),
+                        child: ListView.builder(
+                          shrinkWrap: true,
+                          itemCount: 1,
+                          itemBuilder: (context, int indexBatchID){
+                            return Container(
+                              //height: 200,
+                              margin: EdgeInsets.fromLTRB(0, 15, 0, 10),
+                              decoration: BoxDecoration(
+                                color: Color(0XFFFFFEFC),
+                                borderRadius: BorderRadius.circular(10),
+                              ),
+                              child: Card(
+                                elevation: 5,
+                                child: Column(
+                                    children: [
+                                      Text(number_List[indexBatchID], style: GoogleFonts.rubikBubbles(fontSize: 16)),
+                                      Text(number_List[indexBatchID], style: GoogleFonts.rubikBubbles(fontSize: 16)),
+                                      Text(structure_List[indexBatchID], style: GoogleFonts.nunito(fontSize: 15)),
+                                      Text(period_List[indexBatchID], style: GoogleFonts.nunito(fontSize: 15)),
+                                      Text(name_List[indexBatchID], style: GoogleFonts.nunito(fontSize: 15)),
+                                      Text(position, style: GoogleFonts.nunito(fontSize: 15)),
+                                      Text("Payment : " /*+ payment_List[i]*/, style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic))],
+                                  ),
+                              ),
+                            );
+                          },
+                        ),
+                    ),
                     Visibility(
                       visible: visible,
                       child: Container(
@@ -366,6 +412,7 @@ const List<Color> Gradients1 = [
   Color(0xFF03A0FE),
 ];
 
+
 alertDialogFailedRetrievedData(BuildContext context){
   Widget okButton = TextButton(
     child: Text("Refresh"),

lib/Screens/Menu/SuratTugas/RequestHttp/historyST_post.dart

@@ -28,7 +28,7 @@ class HistoryST_Post {
       "Api-key": apiKey
     });
 
-    developer.log(sendData.body, name: "Get History Reimburse Result");
+    //developer.log(sendData.body, name: "Get History ST Result");
     return sendData.body;
   }
 }

lib/Screens/Menu/SuratTugas/history_st.dart

@@ -67,9 +67,7 @@ class _HistoryST extends State<HistoryST> {
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       getHistoryData();
-      getDetailData();
     });
-    logDev.log(HistoryLength.toString(), name: "Banyak History");
   }
 
   getHistoryData() async {
@@ -141,6 +139,73 @@ class _HistoryST extends State<HistoryST> {
             visible.removeAt(0);
 
             HistoryLength = historyST.length;
+            logDev.log(HistoryLength.toString(), name: "HISTORY LENGTH");
+
+            for (int i = 0; i < HistoryLength;i++){
+              DetailST_Post.connectToAPI(id_List[i]).then((valueResult) async {
+                Map<String, dynamic> object = jsonDecode(valueResult);
+                if (object.containsKey("result").toString() == "true") {
+                  String result = object['result'].toString();
+                  if (result.contains("failed")) {
+                    loading.hide();
+                    alertDialogFailedRetrievedData(context);
+                  } else {
+                    List <dynamic> detailST = object['result'];
+                    loading.hide();
+                    setState(() {
+                      for (int j = 0; j < HistoryLength; j++){
+                        String tglST = detailST[j]['tgl_st'].toString();
+                        String uMuka = detailST[j]['umuka'].toString();
+                        String tglBerangkat = detailST[j]['tgl_berangkat'].toString();
+                        String tglKembali = detailST[j]['tgl_kembali'].toString();
+                        String tujuan = detailST[j]['tujuan'].toString();
+
+                        List<dynamic> ticketID = object['result']['ticket_ids'];
+                        String ticketType = ticketID[j]['type'].toString();
+                        String ticketFrom = ticketID[j]['from'].toString();
+                        String ticketTo = ticketID[j]['to'].toString();
+                        String ticketDate = ticketID[j]['tgl'].toString();
+                        String ticketPrice = ticketID[j]['harga'].toString();
+
+                        tglST_List.add(tglST);
+                        uMuka_List.add(uMuka);
+                        tglBerangkat_List.add(tglBerangkat);
+                        tglKembali_List.add(tglKembali);
+                        tujuan_List.add(tujuan);
+
+                        ticketType_List.add(ticketType);
+                        ticketFrom_List.add(ticketFrom);
+                        ticketTo_List.add(ticketTo);
+                        ticketDate_List.add(ticketDate);
+                        ticketPrice_List.add(ticketPrice);
+
+                        logDev.log(tglST_List.toString(), name:"semua list");
+                      }
+                    });
+                  }
+                } else {
+                  Fluttertoast.showToast(
+                      msg: "Server Response Error",
+                      toastLength: Toast.LENGTH_SHORT,
+                      gravity: ToastGravity.CENTER,
+                      timeInSecForIosWeb: 1,
+                      textColor: Colors.white,
+                      fontSize: 16.0);
+                }
+              });
+            }
+            tglST_List.removeAt(0);
+            uMuka_List.removeAt(0);
+            tglBerangkat_List.removeAt(0);
+            tglKembali_List.removeAt(0);
+            tujuan_List.removeAt(0);
+
+            ticketType_List.removeAt(0);
+            ticketFrom_List.removeAt(0);
+            ticketTo_List.removeAt(0);
+            ticketDate_List.removeAt(0);
+            ticketPrice_List.removeAt(0);
+            loading.hide();
           });
         }
       } else {
@@ -152,9 +217,11 @@ class _HistoryST extends State<HistoryST> {
             textColor: Colors.white,
             fontSize: 16.0);
       }
+      loading.hide();
     });
   }
-  getDetailData() async {
+
+  /*getDetailData() async {
     ProgressDialog loading = ProgressDialog(context);
     loading = ProgressDialog(context,
         type: ProgressDialogType.normal, isDismissible: false, showLogs: true);
@@ -173,6 +240,7 @@ class _HistoryST extends State<HistoryST> {
         messageTextStyle: TextStyle(
             color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w600));
 
+    logDev.log(HistoryLength.toString(), name: "Banyak History");
     for (int i = 0; i < HistoryLength;i++){
       DetailST_Post.connectToAPI(id_List[i]).then((valueResult) async {
         Map<String, dynamic> object = jsonDecode(valueResult);
@@ -210,19 +278,9 @@ class _HistoryST extends State<HistoryST> {
                 ticketTo_List.add(ticketTo);
                 ticketDate_List.add(ticketDate);
                 ticketPrice_List.add(ticketPrice);
-              }
 
-              tglST_List.removeAt(0);
-              uMuka_List.removeAt(0);
-              tglBerangkat_List.removeAt(0);
-              tglKembali_List.removeAt(0);
-              tujuan_List.removeAt(0);
-
-              ticketType_List.removeAt(0);
-              ticketFrom_List.removeAt(0);
-              ticketTo_List.removeAt(0);
-              ticketDate_List.removeAt(0);
-              ticketPrice_List.removeAt(0);
+                logDev.log(tglST_List.toString(), name:"semua list");
+              }
             });
           }
         } else {
@@ -236,8 +294,19 @@ class _HistoryST extends State<HistoryST> {
         }
       });
     }
+    tglST_List.removeAt(0);
+    uMuka_List.removeAt(0);
+    tglBerangkat_List.removeAt(0);
+    tglKembali_List.removeAt(0);
+    tujuan_List.removeAt(0);
+
+    ticketType_List.removeAt(0);
+    ticketFrom_List.removeAt(0);
+    ticketTo_List.removeAt(0);
+    ticketDate_List.removeAt(0);
+    ticketPrice_List.removeAt(0);
     loading.hide();
-  }
+  }*/
 
   @override
   Widget build(BuildContext context) {
@@ -259,7 +328,7 @@ class _HistoryST extends State<HistoryST> {
                           crossAxisAlignment: CrossAxisAlignment.end,
                           children: [
                             Text(
-                              'Assignment Letter\nHistory\t\t',
+                              'History\t\t',
                               maxLines: 1,
                               style: GoogleFonts.luckiestGuy(
                                 fontSize: 28,
@@ -319,7 +388,7 @@ class _HistoryST extends State<HistoryST> {
                                 ),
                               ],
                             ),
-                            Align(
+                            /*Align(
                               alignment: Alignment.centerLeft,
                               child: Visibility(
                                   visible: visible[i],
@@ -329,21 +398,21 @@ class _HistoryST extends State<HistoryST> {
                                       mainAxisAlignment: MainAxisAlignment.start,
                                       crossAxisAlignment: CrossAxisAlignment.start,
                                       children: [
-                                        Text("\nAssignment Letter Date\t : " + tglST_List[i], style: GoogleFonts.josefinSans(fontSize: 15, fontWeight: FontWeight.bold)),
+                                        *//*Text("\nAssignment Letter Date\t : " + tglST_List[i], style: GoogleFonts.josefinSans(fontSize: 15, fontWeight: FontWeight.bold)),*//*
                                         Text("Down Payment\t\t : " + uMuka_List[i], style: GoogleFonts.nunito(fontSize: 15)),
                                         Text("Departure Date\t\t : " + tglBerangkat_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
                                         Text("Return Date\t\t : " + tglKembali_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
                                         Text("Destination\t\t : " + tujuan_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
-                                        Text("Ticket Type\t\t : " + ticketType_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
+                                        *//*Text("Ticket Type\t\t : " + ticketType_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
                                         Text("From\t\t\t : " + ticketFrom_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
                                         Text("To\t\t : " + ticketTo_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
                                         Text("Ticket Date\t\t : " + ticketDate_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
-                                        Text("Ticket Price\t\t\t : " + ticketPrice_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),
+                                        Text("Ticket Price\t\t\t : " + ticketPrice_List[i], style: GoogleFonts.yeonSung(fontSize: 14, fontStyle: FontStyle.italic)),*//*
                                       ],
                                     ),
                                   )
                               ),
-                            )
+                            )*/
                           ],
                         ),
                       ),

lib/Screens/Menu/SuratTugas/surattugas_screen.dart

@@ -5,6 +5,7 @@ import 'package:hris_selfservice_mobile/Screens/Menu/SuratTugas/history_st.dart'
 import 'package:hris_selfservice_mobile/Screens/Menu/SuratTugas/pengajuan_st.dart';
 
 import '../SlipGaji/background.dart';
+import 'deklarasi_st.dart';
 
 class SuratTugas_Screen extends StatefulWidget {
   const SuratTugas_Screen({Key? key}) : super(key: key);
@@ -129,7 +130,7 @@ class _SuratTugas_ScreenState extends State<SuratTugas_Screen> {
                           Navigator.push(
                               context,
                               MaterialPageRoute(
-                                  builder: (context) => PengajuanST_Screen()));
+                                  builder: (context) => DeklarasiST_Screen()));
                         },
                       ),
                       InkWell(

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -14,7 +14,7 @@ import flutter_udid
 import geolocator_apple
 import location
 import path_provider_macos
-import shared_preferences_macos
+import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {

pubspec.lock

@@ -35,7 +35,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   async:
     dependency: "direct main"
     description:
@@ -352,6 +352,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "8.1.2"
+  focus_detector:
+    dependency: "direct main"
+    description:
+      name: focus_detector
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   geocoding:
     dependency: "direct main"
     description:
@@ -526,7 +533,7 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.7.0"
+    version: "4.8.0"
   latlong2:
     dependency: transitive
     description:
@@ -673,7 +680,7 @@ packages:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.0.7"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -778,7 +785,7 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.16"
   shared_preferences_android:
     dependency: transitive
     description:
@@ -786,10 +793,10 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.14"
-  shared_preferences_ios:
+  shared_preferences_foundation:
     dependency: transitive
     description:
-      name: shared_preferences_ios
+      name: shared_preferences_foundation
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
@@ -800,13 +807,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
-  shared_preferences_macos:
-    dependency: transitive
-    description:
-      name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -973,6 +973,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
+  visibility_detector:
+    dependency: transitive
+    description:
+      name: visibility_detector
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.2"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -48,7 +48,6 @@ dependencies:
   dio: ^4.0.6
   get_it: ^7.2.0
   firebase_messaging: ^14.1.3
-  firebase_core: ^2.4.0
   flutter_local_notifications: ^13.0.0
   shared_preferences: ^2.0.15
   # device_information: ^0.0.4
@@ -84,6 +83,8 @@ dependencies:
   connectivity_plus: ^3.0.2
   internet_connection_checker: ^1.0.0+1
   plain_notification_token: ^0.0.4
+  focus_detector: ^2.0.1
+  firebase_core: ^2.4.1
 
 dev_dependencies:
   flutter_test:

remoteconfig.template.json

@@ -1 +0,0 @@
-{}