tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Tb Fajri
2023-08-30 11:08:01 +07:00
parent 8ecbcb1a5c
commit 2f336955ab
14 changed files with 9884 additions and 7436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/Internal/Http/Controllers/Api/CorporateController.php
View File

@@ -430,9 +430,10 @@ class CorporateController extends Controller
// Write Header to File
$result_headers = array_keys($headers_map_to_table_fields);
$result_headers = array_merge($result_headers, ['Ingest Code', 'Ingest Note']);
// dd($result_headers);
$import->addArrayToRow($result_headers);
}
$doc_headers_indexes = [];
foreach ($sheet->getRowIterator() as $index => $row) {
if ($index == 1) { // First Row Must be Header
@@ -447,12 +448,10 @@ class CorporateController extends Controller
// TODO Validate if First Row not Header
} else { // Next Row Should be Data
$row_data = [];
foreach ($row->getCells() as $header_index => $cell) {
if (isset($headers_map_to_table_fields[$doc_headers_indexes[$header_index]]))
$row_data[$headers_map_to_table_fields[$doc_headers_indexes[$header_index]]] = $cell->getValue();
}
try { // Process the Row Data
$corporateService = new CorporateService();
if ($sheet->getName() == 'Plan') {

16
Modules/Internal/Http/Controllers/Api/LivechatController.php
View File

@@ -17,10 +17,20 @@ class LivechatController extends Controller
*/
public function index()
{
$startDate = '2023-01-01';
$endDate = '2023-08-01';
$livechat = Livechat::with('doctor.user', 'doctor.speciality', 'appointment.appointmentDetail', 'healthCare')
->where('nIDAppointment', '!=', null)->where('nIDAppointment', '!=', '')
->latest()
->paginate(15);
->where('nIDAppointment', '!=', null)->where('nIDAppointment', '!=', '');
// dd($livechat);
if ($startDate){
$livechat->where('dStartTime', '>=', $startDate);
}
if ($endDate){
$livechat->where('dStartTime', '<=', $endDate);
}
$livechat->latest()->paginate(15);
return response()->json(Helper::paginateResources(LivechatResource::collection($livechat)));
}

1
Modules/Internal/Http/Controllers/Api/PlanController.php
View File

@@ -120,7 +120,6 @@ class PlanController extends Controller
$result_headers = array_keys($headers_map_to_table_fields);
array_push($result_headers, ['Ingest Code', 'Ingest Note']);
$import->addArrayToRow($result_headers);
die('fuck');
$imported_plan_data = 0;
$failed_plan_data = [];

4
app/Models/OLDLMS/Livechat.php
View File

@@ -14,8 +14,8 @@ class Livechat extends Model
public $sStatusNames = [
0 => 'Menunggu Konfirmasi',
1 => 'Diterima',
2 => 'Ditolak',
3 => 'Selesai',
3 => 'Ditolak',
2 => 'Selesai',
4 => 'Expired',
];

2
frontend/dashboard/.env.development
View File

@@ -2,6 +2,6 @@ GENERATE_SOURCEMAP=false
PORT=8083
REACT_APP_HOST_API_URL="http://127.0.0.1:8000"
REACT_APP_HOST_API_URL="http://lms.test"
VITE_API_URL="http://127.0.0.1:8000/api/internal"

5315
frontend/dashboard/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

76
frontend/dashboard/package.json
View File

@@ -39,27 +39,27 @@
},
"dependencies": {
"@ajoelp/json-to-formdata": "^1.5.0",
"@date-io/date-fns": "^2.16.0",
"@emotion/cache": "^11.10.5",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@hookform/resolvers": "^2.9.10",
"@date-io/date-fns": "^2.17.0",
"@emotion/cache": "^11.11.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@hookform/resolvers": "^2.9.11",
"@iconify/react": "^3.2.2",
"@mui/icons-material": "^5.11.0",
"@mui/icons-material": "^5.14.6",
"@mui/lab": "5.0.0-alpha.80",
"@mui/material": "^5.11.5",
"@mui/system": "^5.11.5",
"@mui/x-data-grid": "^5.17.19",
"@mui/material": "^5.14.6",
"@mui/system": "^5.14.6",
"@mui/x-data-grid": "^5.17.26",
"@mui/x-date-pickers": "5.0.0-beta.2",
"@vitejs/plugin-react": "^1.3.2",
"apexcharts": "^3.36.3",
"apexcharts": "^3.42.0",
"axios": "^0.27.2",
"change-case": "^4.1.2",
"csstype": "^3.1.1",
"date-fns": "^2.29.3",
"esbuild": "^0.17.18",
"csstype": "^3.1.2",
"date-fns": "^2.30.0",
"esbuild": "^0.17.19",
"framer-motion": "^6.5.1",
"highlight.js": "^11.7.0",
"highlight.js": "^11.8.0",
"history": "^5.3.0",
"jsx-runtime": "^1.2.0",
"lodash": "^4.17.21",
@@ -67,51 +67,51 @@
"nprogress": "^0.2.0",
"numeral": "^2.0.6",
"react": "^17.0.2",
"react-apexcharts": "^1.4.0",
"react-apexcharts": "^1.4.1",
"react-dom": "^17.0.2",
"react-dropzone": "^14.2.3",
"react-helmet-async": "^1.3.0",
"react-hook-form": "^7.42.1",
"react-hook-form": "^7.45.4",
"react-intersection-observer": "^8.34.0",
"react-lazy-load-image-component": "^1.5.6",
"react-lazy-load-image-component": "^1.6.0",
"react-quill": "2.0.0-beta.4",
"react-router": "^6.7.0",
"react-router-dom": "^6.7.0",
"react-router": "^6.15.0",
"react-router-dom": "^6.15.0",
"simplebar": "^5.3.9",
"simplebar-react": "^2.4.3",
"stylis": "^4.1.3",
"stylis": "^4.3.0",
"stylis-plugin-rtl": "^2.1.1",
"vite": "^3.2.5",
"vite": "^3.2.7",
"vite-plugin-svgr": "^2.4.0",
"yup": "^0.32.11"
},
"devDependencies": {
"@babel/core": "^7.20.12",
"@babel/eslint-parser": "^7.19.1",
"@babel/plugin-syntax-flow": "^7.18.6",
"@babel/plugin-transform-react-jsx": "^7.20.7",
"@types/lodash": "^4.14.191",
"@babel/core": "^7.22.11",
"@babel/eslint-parser": "^7.22.11",
"@babel/plugin-syntax-flow": "^7.22.5",
"@babel/plugin-transform-react-jsx": "^7.22.5",
"@types/lodash": "^4.14.197",
"@types/nprogress": "^0.2.0",
"@types/react": "^17.0.53",
"@types/react-dom": "^17.0.18",
"@types/react-lazy-load-image-component": "^1.5.2",
"@types/stylis": "^4.0.2",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"eslint": "^8.32.0",
"@types/react": "^17.0.65",
"@types/react-dom": "^17.0.20",
"@types/react-lazy-load-image-component": "^1.5.3",
"@types/stylis": "^4.2.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"eslint": "^8.48.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-airbnb-typescript": "^16.2.0",
"eslint-config-prettier": "^8.6.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-react-app": "7.0.0",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "4.3.0",
"prettier": "^2.8.3",
"typescript": "^4.9.4",
"prettier": "^2.8.8",
"typescript": "^4.9.5",
"vite-plugin-pwa": "^0.12.8"
}
}

4282
frontend/dashboard/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

7614
frontend/dashboard/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
public/dashboard/index.html
View File

@@ -24,7 +24,7 @@
content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
<meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
<meta name="author" content="Minimal UI Kit" />
<script type="module" crossorigin src="/assets/index.37db8778.js"></script>
<script type="module" crossorigin src="/assets/index.9b396686.js"></script>
<link rel="stylesheet" href="/assets/index.c91e36b5.css">
<link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>

2
public/dashboard/sw.js
View File

File diff suppressed because one or more lines are too long

1
public/dashboard/workbox-e0782b83.js
View File

File diff suppressed because one or more lines are too long

BIN
public/files/CorporateMembershipList.xlsx
View File

Binary file not shown.

BIN
public/files/CorporatePlan&BenefitImportData.xlsx
View File

Binary file not shown.