From ad424ecf1940a3ef0e2df50a884165a8249fad48 Mon Sep 17 00:00:00 2001
From: "dwi.firman"
Date: Mon, 9 Sep 2024 11:11:21 +0700
Subject: [PATCH] req Cito untuk pemisah wadir baru
---
Dockerfile | 4 ++--
docker-compose.yml | 4 ++--
src/app/disposisi/arahan/modal.php | 2 +-
src/app/kendali/arahan/modal.php | 2 +-
src/app/kirim/modal_kepada.php | 6 +++---
src/app/koneksi.php | 1 +
src/app/skeluar/modal.php | 2 +-
src/app/smasuk/modal.php | 2 +-
src/app/tindaklanjut/modal_kepada.php | 2 +-
src/supervisord.pid | 1 +
10 files changed, 14 insertions(+), 12 deletions(-)
create mode 100644 src/supervisord.pid
diff --git a/Dockerfile b/Dockerfile
index b0ad3ac..7001116 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm-alpine
+FROM php:7.4-fpm-alpine
# FROM alpine:latest
ENV ACCEPT_EULA=Y
@@ -59,6 +59,6 @@ COPY ./_docker/supervisord/supervisord.conf /etc/supervisord.conf
# RUN chown -R www-data:www-data /mnt/media/ris
# COPY --chown=www-data:www-data ./media/ .
-EXPOSE 80 443
+EXPOSE 80
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index eaaa7e0..7d9196a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ version: '3.8'
services:
app:
build: .
- container_name: eletter
+ container_name: eletter_dev
restart: always
volumes:
- ./src:/app
@@ -20,7 +20,7 @@ services:
# environment:
# - "APP_PORT=8080"
ports:
- - "8061:80"
+ - "8062:80"
# networks:
# - bridge2
# networks:
diff --git a/src/app/disposisi/arahan/modal.php b/src/app/disposisi/arahan/modal.php
index 452ae83..9465497 100644
--- a/src/app/disposisi/arahan/modal.php
+++ b/src/app/disposisi/arahan/modal.php
@@ -71,7 +71,7 @@ while($row=pg_fetch_array($data)) {
CAST(SPLIT_PART(CASE WHEN s.kode_satker='' THEN '999.0' ELSE s.kode_satker END,'.',2) AS INTEGER)
FROM data_user k
INNER JOIN jabatan_pegawai j ON (j.id=k.jabatan_pegawai_id)
- INNER JOIN satuan_kerja s ON (s.id=k.satuan_kerja_id) WHERE LOWER(j.nama) NOT LIKE '%akun lama%' AND k.aktif='t'
+ INNER JOIN satuan_kerja s ON (s.id=k.satuan_kerja_id) WHERE LOWER(j.nama) NOT LIKE '%akun lama%' AND k.aktif='t' AND j.id !=664
ORDER BY SPLIT_PART(CASE WHEN s.kode_satker='' THEN '999.0' ELSE s.kode_satker END,'.',1) ASC,
CAST(SPLIT_PART(CASE WHEN s.kode_satker='' THEN '999.0' ELSE s.kode_satker END,'.',2) AS INTEGER) ASC");
while($rows=pg_fetch_array($userpeg)) {
diff --git a/src/app/kendali/arahan/modal.php b/src/app/kendali/arahan/modal.php
index 6dc2385..00d0c6d 100644
--- a/src/app/kendali/arahan/modal.php
+++ b/src/app/kendali/arahan/modal.php
@@ -49,7 +49,7 @@ while($row=pg_fetch_array($data)) {