Update Git Ignore

.env

@@ -0,0 +1,4 @@
+AUTHENTIK_ERROR_REPORTING__ENABLED=true
+PG_PASS=guR8uchQhQFAGi4yXfHPrF2AHTgN15sOViDL7tu0bfoiPmdI
+AUTHENTIK_SECRET_KEY=HeBg31UJE0AEK2JNWpXx1+6v7SjlYr9HKxDZi66dNsrhy+9XpOz9LOw81bWNHDo/lFiORMxVa1f+
+q1Yt

.gitignore

@@ -1,10 +1,10 @@
 # Ignore environment files
-.env
 
+mergekemain.sh
 # Ignore Laravel cache, logs, and storage
-/storage/*
-!/storage/.gitignore
-
+/htdocs/storage/*
+!/htdocs/storage/.gitignore
+/htdocs/.env
 # Ignore bootstrap cache
-/bootstrap/cache/*
-!/bootstrap/cache/.gitignore
+/htdocs/bootstrap/cache/*
+!/htdocs/bootstrap/cache/.gitignore

docker-compose.yml

@@ -0,0 +1,46 @@
+services:
+  # NginxProxyManager
+  #---------------------------------------------------------------#
+  # Authentik Database
+  postgresql:
+    image: docker.io/library/postgres:12-alpine
+    mem_limit: 1g
+    cpus: 1.0
+    container_name: laravel-db
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+      start_period: 20s
+      interval: 30s
+      retries: 5
+      timeout: 5s
+    volumes:
+      - ./authentik/database:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: ${PG_PASS:?database password required}
+      POSTGRES_USER: ${PG_USER:-authentik}
+      POSTGRES_DB: ${PG_DB:-authentik}
+    env_file:
+      - .env
+    networks:
+      - proxy
+
+  laravel:
+    build:
+      context: ./htdocs
+      dockerfile: Dockerfile
+    container_name: laravel
+    restart: unless-stopped
+    volumes:
+      - ./htdocs:/var/www/html
+    ports:
+      - "8088:8080"
+    depends_on:
+      - laravel-db
+    command: php artisan serve --host=0.0.0.0 --port=8080
+    networks:
+      - proxy
+
+networks:
+  proxy:
+    external: true

htdocs/Dockerfile

@@ -0,0 +1,66 @@
+FROM php:8.3-fpm
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    pkg-config \
+    libzip-dev \
+    libpng-dev \
+    libjpeg-dev \
+    libonig-dev \
+    libxml2-dev \
+    libxslt-dev \
+    libmagickwand-dev \
+    libreadline-dev \
+    libsodium-dev \
+    libc-client-dev \
+    libkrb5-dev \
+    unzip \
+    git \
+    curl \
+    zip \
+    build-essential \
+    autoconf \
+    libtool \
+    libsqlite3-dev \
+    mariadb-client \
+ && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+ && docker-php-ext-install \
+        dom \
+        xml \
+        xsl \
+        bcmath \
+        calendar \
+        exif \
+        ftp \
+        gd \
+        gettext \
+        mbstring \
+        pcntl \
+        pdo_mysql \
+        pdo_sqlite \
+        posix \
+        shmop \
+        simplexml \
+        sockets \
+        sodium \
+        zip \
+        imap \
+        xmlwriter \
+ && pecl install imagick \
+ && docker-php-ext-enable imagick \
+ && apt-get purge -y --auto-remove \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+# Install Laravel 10.10 secara langsung (opsional jika project belum ada)
+# RUN composer create-project laravel/laravel:^10 /var/www/html
+
+# Set permission
+RUN chown -R www-data:www-data /var/www/html/storage /var/www/html/bootstrap/cache
+
+EXPOSE 9000
+CMD ["php-fpm"]

htdocs/app/Http/Controllers/DokterController.php

@@ -2718,7 +2718,7 @@ class DokterController extends Controller
 					$kolomttd 	= '<td>&nbsp;</td><td><font color="grey">'.$nomor.'</font></td>';
 					$kanan 		= '';
 				}
-				$cetak 		= 	$cetak.'<tr><td align="center">'.$nomor.'</td><td>'.$periksa->nofoto.'</td><td>'.$periksa->noregister.'</td><td>'.$periksa->nmpasien.'</td><td>'.$periksa->jkpasien.'</td><td>'.$periksa->mulai.'</td><td>'.$periksa->asalpasien.'</td><td>'.$periksa->kd_spesimen.'</td><td>'.$periksa->nm_spesimen.'</td>'.$kolomttd.'</tr>';
+				$cetak = $cetak.'<tr><td align="center">'.$nomor.'</td><td>'.$periksa->nofoto.'</td><td>'.$periksa->noregister.'</td><td>'.$periksa->nmpasien.'</td><td>'.$periksa->jkpasien.'</td><td>'.$periksa->mulai.'</td><td>'.$periksa->asalpasien.'</td><td>'.$periksa->kd_spesimen.'</td><td>'.$periksa->nm_spesimen.'</td>'.$kolomttd.'</tr>';
 				$nomor++;
 			}
 		}

htdocs/app/Http/Controllers/FrontpageController.php

@@ -969,8 +969,8 @@ class FrontpageController extends Controller
 			return back();
         } else {
             $jk     		= $request->input('jk');
-			$nik     		= $request->input('nik');
-			$bpjs     		= $request->input('bpjs');
+			$nik     		= $request->input('nik') ?? time();
+			$bpjs     		= $request->input('bpjs') ?? time();
 			$alamat 		= $request->input('alamat') ?? config('global.addressapps');
 			$kota 			= $request->input('kota') ?? config('global.subdomainapps');
 			$noregister     = $request->input('noregister');
@@ -997,8 +997,15 @@ class FrontpageController extends Controller
 			$jenisgambar	= $request->input('jenisgambar');
 			$file			= $request->input('file');
 			$poli_id		= $request->input('poli_id') ?? 1;
-			$kd_spesimen    = $request->input('kd_spesimen') ?? '';
-			$nm_spesimen    = $request->input('nm_spesimen') ?? '';
+			$cekkodespes 	= Organisms::where('id', $ruangan)->first();
+			if (isset($cekkodespes->name)){
+				$nm_spesimen    = $cekkodespes->name;
+				$kd_spesimen    = $cekkodespes->category;
+			} else {
+				$kd_spesimen    = $request->input('kd_spesimen') ?? '';
+				$nm_spesimen    = $request->input('nm_spesimen') ?? '';
+			}
+			
 			$reques			= 'Specimen';
 			$kelompok		= Session('previlage');
 			$daftar         = date('Y-m-d H:i:s');
@@ -1110,7 +1117,7 @@ class FrontpageController extends Controller
 					$modality		= $check->modaliti ?? 'OT';
 					$modaliti2		= $check->modaliti2 ?? '';
 					if (isset($check->subsubpoli)){
-						$rekues 	= $subpoli.' - '.$subsubpoli;
+						$rekues 	= $subpoli.' - '.$check->subsubpoli;
 					} else {
 						$rekues 	= $subpoli;
 					}
@@ -1245,7 +1252,7 @@ class FrontpageController extends Controller
 					$modality		= $check->modaliti ?? 'OT';
 					$modaliti2		= $check->modaliti2 ?? '';
 					if (isset($check->subsubpoli)){
-						$rekues = $subpoli.' - '.$subsubpoli;
+						$rekues = $subpoli.' - '.$check->subsubpoli;
 					} else {
 						$rekues = $subpoli;
 					}
@@ -1291,7 +1298,7 @@ class FrontpageController extends Controller
 								'rjenis'		=> $jk,
 								'kodedok'		=> Session('id'),
 								'namadok'		=> Session('nama'),
-								'ruangan'		=> $kamar,
+								'ruangan'		=> 'Mikrobiologi',
 								'tes'			=> $rekues,
 								'alat'			=> 'All',
 								'kd_spesimen'	=> $kd_spesimen,