first time include all file
This commit is contained in:
@@ -0,0 +1,75 @@
|
||||
# React + TypeScript + Vite
|
||||
|
||||
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||
|
||||
Currently, two official plugins are available:
|
||||
|
||||
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Oxc](https://oxc.rs)
|
||||
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/)
|
||||
|
||||
## React Compiler
|
||||
|
||||
The React Compiler is enabled on this template. See [this documentation](https://react.dev/learn/react-compiler) for more information.
|
||||
|
||||
Note: This will impact Vite dev & build performances.
|
||||
|
||||
## Expanding the ESLint configuration
|
||||
|
||||
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
|
||||
|
||||
```js
|
||||
export default defineConfig([
|
||||
globalIgnores(['dist']),
|
||||
{
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
extends: [
|
||||
// Other configs...
|
||||
|
||||
// Remove tseslint.configs.recommended and replace with this
|
||||
tseslint.configs.recommendedTypeChecked,
|
||||
// Alternatively, use this for stricter rules
|
||||
tseslint.configs.strictTypeChecked,
|
||||
// Optionally, add this for stylistic rules
|
||||
tseslint.configs.stylisticTypeChecked,
|
||||
|
||||
// Other configs...
|
||||
],
|
||||
languageOptions: {
|
||||
parserOptions: {
|
||||
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||
tsconfigRootDir: import.meta.dirname,
|
||||
},
|
||||
// other options...
|
||||
},
|
||||
},
|
||||
])
|
||||
```
|
||||
|
||||
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
|
||||
|
||||
```js
|
||||
// eslint.config.js
|
||||
import reactX from 'eslint-plugin-react-x'
|
||||
import reactDom from 'eslint-plugin-react-dom'
|
||||
|
||||
export default defineConfig([
|
||||
globalIgnores(['dist']),
|
||||
{
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
extends: [
|
||||
// Other configs...
|
||||
// Enable lint rules for React
|
||||
reactX.configs['recommended-typescript'],
|
||||
// Enable lint rules for React DOM
|
||||
reactDom.configs.recommended,
|
||||
],
|
||||
languageOptions: {
|
||||
parserOptions: {
|
||||
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||
tsconfigRootDir: import.meta.dirname,
|
||||
},
|
||||
// other options...
|
||||
},
|
||||
},
|
||||
])
|
||||
```
|
||||
@@ -0,0 +1,22 @@
|
||||
import js from '@eslint/js'
|
||||
import globals from 'globals'
|
||||
import reactHooks from 'eslint-plugin-react-hooks'
|
||||
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||
import tseslint from 'typescript-eslint'
|
||||
import { defineConfig, globalIgnores } from 'eslint/config'
|
||||
|
||||
export default defineConfig([
|
||||
globalIgnores(['dist']),
|
||||
{
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
extends: [
|
||||
js.configs.recommended,
|
||||
tseslint.configs.recommended,
|
||||
reactHooks.configs.flat.recommended,
|
||||
reactRefresh.configs.vite,
|
||||
],
|
||||
languageOptions: {
|
||||
globals: globals.browser,
|
||||
},
|
||||
},
|
||||
])
|
||||
@@ -0,0 +1,13 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>carvalidationi ui</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
Generated
+3544
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,48 @@
|
||||
{
|
||||
"name": "carvalidationui",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc -b && vite build",
|
||||
"lint": "eslint .",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@redux-devtools/extension": "^4.0.0",
|
||||
"@reduxjs/toolkit": "^2.12.0",
|
||||
"@tailwindcss/vite": "^4.3.0",
|
||||
"formik": "^2.4.9",
|
||||
"moment": "^2.30.1",
|
||||
"primeicons": "^7.0.0",
|
||||
"primereact": "^10.9.8",
|
||||
"react": "^19.2.6",
|
||||
"react-dom": "^19.2.6",
|
||||
"react-redux": "^9.3.0",
|
||||
"react-router-dom": "^7.15.1",
|
||||
"redux-thunk": "^3.1.0",
|
||||
"tailwindcss": "^4.3.0",
|
||||
"yup": "^1.7.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.29.0",
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@rolldown/plugin-babel": "^0.2.3",
|
||||
"@types/babel__core": "^7.20.5",
|
||||
"@types/node": "^24.12.3",
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@types/react-redux": "^7.1.34",
|
||||
"@types/yup": "^0.29.14",
|
||||
"@vitejs/plugin-react": "^6.0.1",
|
||||
"babel-plugin-react-compiler": "^1.0.0",
|
||||
"eslint": "^10.3.0",
|
||||
"eslint-plugin-react-hooks": "^7.1.1",
|
||||
"eslint-plugin-react-refresh": "^0.5.2",
|
||||
"globals": "^17.6.0",
|
||||
"typescript": "~6.0.2",
|
||||
"typescript-eslint": "^8.59.2",
|
||||
"vite": "^8.0.12"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"API_URL": "http://localhost:5100/api/v1"
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 9.3 KiB |
@@ -0,0 +1,24 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg">
|
||||
<symbol id="bluesky-icon" viewBox="0 0 16 17">
|
||||
<g clip-path="url(#bluesky-clip)"><path fill="#08060d" d="M7.75 7.735c-.693-1.348-2.58-3.86-4.334-5.097-1.68-1.187-2.32-.981-2.74-.79C.188 2.065.1 2.812.1 3.251s.241 3.602.398 4.13c.52 1.744 2.367 2.333 4.07 2.145-2.495.37-4.71 1.278-1.805 4.512 3.196 3.309 4.38-.71 4.987-2.746.608 2.036 1.307 5.91 4.93 2.746 2.72-2.746.747-4.143-1.747-4.512 1.702.189 3.55-.4 4.07-2.145.156-.528.397-3.691.397-4.13s-.088-1.186-.575-1.406c-.42-.19-1.06-.395-2.741.79-1.755 1.24-3.64 3.752-4.334 5.099"/></g>
|
||||
<defs><clipPath id="bluesky-clip"><path fill="#fff" d="M.1.85h15.3v15.3H.1z"/></clipPath></defs>
|
||||
</symbol>
|
||||
<symbol id="discord-icon" viewBox="0 0 20 19">
|
||||
<path fill="#08060d" d="M16.224 3.768a14.5 14.5 0 0 0-3.67-1.153c-.158.286-.343.67-.47.976a13.5 13.5 0 0 0-4.067 0c-.128-.306-.317-.69-.476-.976A14.4 14.4 0 0 0 3.868 3.77C1.546 7.28.916 10.703 1.231 14.077a14.7 14.7 0 0 0 4.5 2.306q.545-.748.965-1.587a9.5 9.5 0 0 1-1.518-.74q.191-.14.372-.293c2.927 1.369 6.107 1.369 8.999 0q.183.152.372.294-.723.437-1.52.74.418.838.963 1.588a14.6 14.6 0 0 0 4.504-2.308c.37-3.911-.63-7.302-2.644-10.309m-9.13 8.234c-.878 0-1.599-.82-1.599-1.82 0-.998.705-1.82 1.6-1.82.894 0 1.614.82 1.599 1.82.001 1-.705 1.82-1.6 1.82m5.91 0c-.878 0-1.599-.82-1.599-1.82 0-.998.705-1.82 1.6-1.82.893 0 1.614.82 1.599 1.82 0 1-.706 1.82-1.6 1.82"/>
|
||||
</symbol>
|
||||
<symbol id="documentation-icon" viewBox="0 0 21 20">
|
||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="m15.5 13.333 1.533 1.322c.645.555.967.833.967 1.178s-.322.623-.967 1.179L15.5 18.333m-3.333-5-1.534 1.322c-.644.555-.966.833-.966 1.178s.322.623.966 1.179l1.534 1.321"/>
|
||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M17.167 10.836v-4.32c0-1.41 0-2.117-.224-2.68-.359-.906-1.118-1.621-2.08-1.96-.599-.21-1.349-.21-2.848-.21-2.623 0-3.935 0-4.983.369-1.684.591-3.013 1.842-3.641 3.428C3 6.449 3 7.684 3 10.154v2.122c0 2.558 0 3.838.706 4.726q.306.383.713.671c.76.536 1.79.64 3.581.66"/>
|
||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M3 10a2.78 2.78 0 0 1 2.778-2.778c.555 0 1.209.097 1.748-.047.48-.129.854-.503.982-.982.145-.54.048-1.194.048-1.749a2.78 2.78 0 0 1 2.777-2.777"/>
|
||||
</symbol>
|
||||
<symbol id="github-icon" viewBox="0 0 19 19">
|
||||
<path fill="#08060d" fill-rule="evenodd" d="M9.356 1.85C5.05 1.85 1.57 5.356 1.57 9.694a7.84 7.84 0 0 0 5.324 7.44c.387.079.528-.168.528-.376 0-.182-.013-.805-.013-1.454-2.165.467-2.616-.935-2.616-.935-.349-.91-.864-1.143-.864-1.143-.71-.48.051-.48.051-.48.787.051 1.2.805 1.2.805.695 1.194 1.817.857 2.268.649.064-.507.27-.857.49-1.052-1.728-.182-3.545-.857-3.545-3.87 0-.857.31-1.558.8-2.104-.078-.195-.349-1 .077-2.078 0 0 .657-.208 2.14.805a7.5 7.5 0 0 1 1.946-.26c.657 0 1.328.092 1.946.26 1.483-1.013 2.14-.805 2.14-.805.426 1.078.155 1.883.078 2.078.502.546.799 1.247.799 2.104 0 3.013-1.818 3.675-3.558 3.87.284.247.528.714.528 1.454 0 1.052-.012 1.896-.012 2.156 0 .208.142.455.528.377a7.84 7.84 0 0 0 5.324-7.441c.013-4.338-3.48-7.844-7.773-7.844" clip-rule="evenodd"/>
|
||||
</symbol>
|
||||
<symbol id="social-icon" viewBox="0 0 20 20">
|
||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M12.5 6.667a4.167 4.167 0 1 0-8.334 0 4.167 4.167 0 0 0 8.334 0"/>
|
||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M2.5 16.667a5.833 5.833 0 0 1 8.75-5.053m3.837.474.513 1.035c.07.144.257.282.414.309l.93.155c.596.1.736.536.307.965l-.723.73a.64.64 0 0 0-.152.531l.207.903c.164.715-.213.991-.84.618l-.872-.52a.63.63 0 0 0-.577 0l-.872.52c-.624.373-1.003.094-.84-.618l.207-.903a.64.64 0 0 0-.152-.532l-.723-.729c-.426-.43-.289-.864.306-.964l.93-.156a.64.64 0 0 0 .412-.31l.513-1.034c.28-.562.735-.562 1.012 0"/>
|
||||
</symbol>
|
||||
<symbol id="x-icon" viewBox="0 0 19 19">
|
||||
<path fill="#08060d" fill-rule="evenodd" d="M1.893 1.98c.052.072 1.245 1.769 2.653 3.77l2.892 4.114c.183.261.333.48.333.486s-.068.089-.152.183l-.522.593-.765.867-3.597 4.087c-.375.426-.734.834-.798.905a1 1 0 0 0-.118.148c0 .01.236.017.664.017h.663l.729-.83c.4-.457.796-.906.879-.999a692 692 0 0 0 1.794-2.038c.034-.037.301-.34.594-.675l.551-.624.345-.392a7 7 0 0 1 .34-.374c.006 0 .93 1.306 2.052 2.903l2.084 2.965.045.063h2.275c1.87 0 2.273-.003 2.266-.021-.008-.02-1.098-1.572-3.894-5.547-2.013-2.862-2.28-3.246-2.273-3.266.008-.019.282-.332 2.085-2.38l2-2.274 1.567-1.782c.022-.028-.016-.03-.65-.03h-.674l-.3.342a871 871 0 0 1-1.782 2.025c-.067.075-.405.458-.75.852a100 100 0 0 1-.803.91c-.148.172-.299.344-.99 1.127-.304.343-.32.358-.345.327-.015-.019-.904-1.282-1.976-2.808L6.365 1.85H1.8zm1.782.91 8.078 11.294c.772 1.08 1.413 1.973 1.425 1.984.016.017.241.02 1.05.017l1.03-.004-2.694-3.766L7.796 5.75 5.722 2.852l-1.039-.004-1.039-.004z" clip-rule="evenodd"/>
|
||||
</symbol>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.9 KiB |
@@ -0,0 +1,184 @@
|
||||
.counter {
|
||||
font-size: 16px;
|
||||
padding: 5px 10px;
|
||||
border-radius: 5px;
|
||||
color: var(--accent);
|
||||
background: var(--accent-bg);
|
||||
border: 2px solid transparent;
|
||||
transition: border-color 0.3s;
|
||||
margin-bottom: 24px;
|
||||
|
||||
&:hover {
|
||||
border-color: var(--accent-border);
|
||||
}
|
||||
&:focus-visible {
|
||||
outline: 2px solid var(--accent);
|
||||
outline-offset: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
.hero {
|
||||
position: relative;
|
||||
|
||||
.base,
|
||||
.framework,
|
||||
.vite {
|
||||
inset-inline: 0;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.base {
|
||||
width: 170px;
|
||||
position: relative;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.framework,
|
||||
.vite {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.framework {
|
||||
z-index: 1;
|
||||
top: 34px;
|
||||
height: 28px;
|
||||
transform: perspective(2000px) rotateZ(300deg) rotateX(44deg) rotateY(39deg)
|
||||
scale(1.4);
|
||||
}
|
||||
|
||||
.vite {
|
||||
z-index: 0;
|
||||
top: 107px;
|
||||
height: 26px;
|
||||
width: auto;
|
||||
transform: perspective(2000px) rotateZ(300deg) rotateX(40deg) rotateY(39deg)
|
||||
scale(0.8);
|
||||
}
|
||||
}
|
||||
|
||||
#center {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 25px;
|
||||
place-content: center;
|
||||
place-items: center;
|
||||
flex-grow: 1;
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
padding: 32px 20px 24px;
|
||||
gap: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
#next-steps {
|
||||
display: flex;
|
||||
border-top: 1px solid var(--border);
|
||||
text-align: left;
|
||||
|
||||
& > div {
|
||||
flex: 1 1 0;
|
||||
padding: 32px;
|
||||
@media (max-width: 1024px) {
|
||||
padding: 24px 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.icon {
|
||||
margin-bottom: 16px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
}
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
flex-direction: column;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
#docs {
|
||||
border-right: 1px solid var(--border);
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
border-right: none;
|
||||
border-bottom: 1px solid var(--border);
|
||||
}
|
||||
}
|
||||
|
||||
#next-steps ul {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
margin: 32px 0 0;
|
||||
|
||||
.logo {
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
a {
|
||||
color: var(--text-h);
|
||||
font-size: 16px;
|
||||
border-radius: 6px;
|
||||
background: var(--social-bg);
|
||||
display: flex;
|
||||
padding: 6px 12px;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
text-decoration: none;
|
||||
transition: box-shadow 0.3s;
|
||||
|
||||
&:hover {
|
||||
box-shadow: var(--shadow);
|
||||
}
|
||||
.button-icon {
|
||||
height: 18px;
|
||||
width: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
margin-top: 20px;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
|
||||
li {
|
||||
flex: 1 1 calc(50% - 8px);
|
||||
}
|
||||
|
||||
a {
|
||||
width: 100%;
|
||||
justify-content: center;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#spacer {
|
||||
height: 88px;
|
||||
border-top: 1px solid var(--border);
|
||||
@media (max-width: 1024px) {
|
||||
height: 48px;
|
||||
}
|
||||
}
|
||||
|
||||
.ticks {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
|
||||
&::before,
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: -4.5px;
|
||||
border: 5px solid transparent;
|
||||
}
|
||||
|
||||
&::before {
|
||||
left: 0;
|
||||
border-left-color: var(--border);
|
||||
}
|
||||
&::after {
|
||||
right: 0;
|
||||
border-right-color: var(--border);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
import './App.css';
|
||||
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
|
||||
import Login from './login/login';
|
||||
import Home from './home/home';
|
||||
import { AuthProvider } from './share/authcontext';
|
||||
import { ProtectedRoute, PublicRoute } from './share/routeprotest';
|
||||
import { MainLayout } from './layouts/MainLayout';
|
||||
import 'primereact/resources/themes/tailwind-light/theme.css';
|
||||
import AdminUserApp from './adminuser/adminuser';
|
||||
import ValidationPointApp from './validationpoint/validationpoint';
|
||||
import ConcessionTypeApp from './concessionType/concessionType';
|
||||
import EditConcessionTypeApp from './concessionType/editconcesstype';
|
||||
import ConcessionValidationApp from './concessionvalidation/concessionvalidation';
|
||||
import EditConcessionValidationApp from './concessionvalidation/editconcessvalidation';
|
||||
|
||||
function App() {
|
||||
|
||||
return (
|
||||
|
||||
<AuthProvider>
|
||||
<BrowserRouter>
|
||||
<Routes>
|
||||
{/* Public-only Routes (Redirects to dashboard if already logged in) */}
|
||||
<Route element={<PublicRoute />}>
|
||||
<Route path="/login" element={<Login />} />
|
||||
</Route>
|
||||
|
||||
{/* Protected Routes (Redirects to login if not logged in) */}
|
||||
<Route element={<ProtectedRoute />}>
|
||||
<Route element={<MainLayout />}>
|
||||
<Route path="/home" element={<Home />} />
|
||||
<Route path="/validationpoint" element={<ValidationPointApp />} />
|
||||
<Route path="/adminuser" element={<AdminUserApp />} />
|
||||
<Route path="/concessiontype" element={<ConcessionTypeApp/>} />
|
||||
<Route path="/concessiontype/:id" element={<EditConcessionTypeApp />} />
|
||||
<Route path="/concessionvalidation" element={<ConcessionValidationApp/>} />
|
||||
<Route path="/concessionvalidation/:id" element={<EditConcessionValidationApp/>} />
|
||||
</Route>
|
||||
</Route>
|
||||
|
||||
{/* Catch-all fallback */}
|
||||
<Route path="*" element={<Navigate to="/login" replace />} />
|
||||
</Routes>
|
||||
</BrowserRouter>
|
||||
</AuthProvider>
|
||||
|
||||
);
|
||||
}
|
||||
export default App;
|
||||
|
||||
/*
|
||||
// Parent Route
|
||||
<Route path="/users" element={<UserLayout />}>
|
||||
// Child Route with ID parameter
|
||||
<Route path=":id" element={<UserProfile />} />
|
||||
</Route>
|
||||
*/
|
||||
/*
|
||||
npm run build
|
||||
npx vite build
|
||||
vite build
|
||||
vite build --base=/myWebsite/
|
||||
*/
|
||||
@@ -0,0 +1,192 @@
|
||||
import { useState, useEffect , type ChangeEvent } from 'react';
|
||||
import {type AdminUserDto,type Lookup,type ValidationPointDto,AdminRole} from '../models';
|
||||
// const API_URL = 'https://typicode.com';
|
||||
import { adminUserService ,validationpointService} from '../services';
|
||||
|
||||
export default function AdminUserApp() {
|
||||
// Example array typed as an array of ValidationPoints
|
||||
const roleList: Lookup[] = [
|
||||
{ id: AdminRole.Normal, description: "Normal" },
|
||||
{ id: AdminRole.Admin, description: "Admin" }
|
||||
];
|
||||
const empty: AdminUserDto =
|
||||
{
|
||||
id: -1,stafflinkNo: '',firstName: '', lastName: '',
|
||||
addedOn: '',active: false,
|
||||
roleType: AdminRole.Normal,validationPointId: 0
|
||||
};
|
||||
const [adminUsers, setAdminUsers] = useState<AdminUserDto[]>([]);
|
||||
const [form, setForm] = useState<AdminUserDto>(empty);
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
const [valdationPoints, setValidateionPoints] = useState<ValidationPointDto[]>([]);
|
||||
|
||||
// READ: Fetch all customers
|
||||
useEffect(() => {
|
||||
fetchAdminUsers();
|
||||
fecthValidationPoint();
|
||||
}, []);
|
||||
const fecthValidationPoint = async () => {
|
||||
try{
|
||||
const vpres = await validationpointService.get();
|
||||
if (vpres.statusCode == 1)
|
||||
setValidateionPoints(vpres.data);
|
||||
}
|
||||
catch (error) {
|
||||
console.error('error loading Validation Point', error);
|
||||
}
|
||||
};
|
||||
const fetchAdminUsers = async () => {
|
||||
|
||||
try {
|
||||
const response = await adminUserService.get();
|
||||
//const data = await response.json();
|
||||
if (response.statusCode == 1)
|
||||
setAdminUsers(response.data.slice(0, 5)); // Limiting to 5 for preview
|
||||
} catch (error) {
|
||||
console.error('Error fetching data:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// INPUT HANDLER
|
||||
const handleInputChange = (e: { target: { name: any; value: any; }; }) => {
|
||||
const { name, value } = e.target;
|
||||
setForm({ ...form, [name]: value });
|
||||
};
|
||||
// 3. Type the event as ChangeEvent<HTMLSelectElement>
|
||||
const handleSelectInputChange = (e: ChangeEvent<HTMLSelectElement>): void => {
|
||||
const { name, value } = e.target;
|
||||
const id = Number(value);
|
||||
console.log("handle select name, value and id", name, value, id);
|
||||
setForm((prevData) => ({
|
||||
...prevData,
|
||||
[name]: id
|
||||
}));
|
||||
};
|
||||
// CREATE & UPDATE: Submit handler
|
||||
const handleSubmit = async (e: { preventDefault: () => void; }) => {
|
||||
e.preventDefault();
|
||||
if (!form.firstName || !form.stafflinkNo) return alert('Please fill in all fields');
|
||||
console.log("what is data to save", form);
|
||||
|
||||
// SAVE (create/update)
|
||||
try {
|
||||
const oid = form.id;
|
||||
const nid = await adminUserService.save(form);
|
||||
form.id = nid.data;
|
||||
if (oid < 0)
|
||||
{
|
||||
const olist = adminUsers;
|
||||
olist.push(form);
|
||||
setAdminUsers(olist);
|
||||
}
|
||||
else
|
||||
{
|
||||
setAdminUsers(adminUsers.map(c => c.id === form.id ? form : c));
|
||||
}
|
||||
clearForm();
|
||||
} catch (error) {
|
||||
console.error('Error updating customer:', error);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// DELETE
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
const respose = await adminUserService.delete(id);
|
||||
if (respose.data > 0)
|
||||
setAdminUsers(adminUsers.filter(c => c.id !== id));
|
||||
else
|
||||
console.error('something is wrong', respose);
|
||||
} catch (error) {
|
||||
console.error('Error deleting customer:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// UTILITIES
|
||||
const handleEditClick = (adminUser:AdminUserDto) => {
|
||||
setForm(adminUser);
|
||||
setIsEditing(true);
|
||||
};
|
||||
|
||||
const clearForm = () => {
|
||||
setForm(empty);
|
||||
setIsEditing(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className='p-5'>
|
||||
<h2>AdminUser Management (CRUD)</h2>
|
||||
|
||||
{/* FORM COMPONENT */}
|
||||
<form onSubmit={handleSubmit} >
|
||||
<div className='m-2 grid grid-cols-3 gap-4'>
|
||||
<input
|
||||
type="text" name="firstName" placeholder="First Name"
|
||||
value={form.firstName} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="text" name="lastName" placeholder="Last Name"
|
||||
value={form.lastName} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="text" name="stafflinkNo" placeholder="stafflinkNo"
|
||||
value={form.stafflinkNo} onChange={handleInputChange}
|
||||
/>
|
||||
<select name="validationPointId" id="validationPointId"
|
||||
value={form.validationPointId} // <-- 1. Bind to model state
|
||||
onChange={handleSelectInputChange}
|
||||
>
|
||||
<option value="">-- Please choose validation point --</option>
|
||||
{/* 4. Map over the array to generate options dynamically */}
|
||||
{valdationPoints.map((val) => (
|
||||
<option key={val.id} value={val.id}>
|
||||
{val.description}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
<select name="roleType" id="roleType"
|
||||
value={form.roleType} // <-- 1. Bind to model state
|
||||
onChange={handleSelectInputChange}
|
||||
>
|
||||
<option value="">-- Please choose role type --</option>
|
||||
{/* 4. Map over the array to generate options dynamically */}
|
||||
{roleList.map((val) => (
|
||||
<option key={val.id} value={val.id}>
|
||||
{val.description}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
<div className='flex justify-end'>
|
||||
<button type="submit" className="text-white mr-2 bg-green-600 box-border border border-transparent hover:bg-green-800 focus:ring-4 focus:ring-success-medium shadow-xs font-medium leading-5 rounded-base text-sm px-4 py-2.5 focus:outline-none">
|
||||
{isEditing ? 'Update' : 'Add'}</button>
|
||||
{/*
|
||||
<button type="submit">{isEditing ? 'Update' : 'Add'}</button>
|
||||
*/}
|
||||
{isEditing && <button type="button" onClick={clearForm}>Cancel</button>}
|
||||
</div>
|
||||
</form>
|
||||
<hr className="h-1 mx-auto my-2 bg-gray-200 border-0 rounded-sm md:my-4"></hr>
|
||||
<div className='mt-2'>
|
||||
{/* LIST COMPONENT */}
|
||||
<ul style={{ listStyle: 'none', padding: 0 }}>
|
||||
{adminUsers.map(item => (
|
||||
<li key={item.id} style={
|
||||
{ padding: '10px', borderBottom: '1px solid #ccc',
|
||||
display: 'flex', justifyContent: 'space-between' }}>
|
||||
<div>
|
||||
<strong>{item.firstName} {item.lastName}</strong> ({item.stafflinkNo})
|
||||
</div>
|
||||
<div>
|
||||
<button onClick={() => handleEditClick(item)} className='text-white hover:bg-green-800 bg-green-600 mr-2'>Edit</button>
|
||||
<button onClick={() => handleDelete(item.id)} className='hover:bg-red-500 hover:text-white'>Delete</button>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
import React, { useState } from 'react';
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
import { RootState, AppDispatch } from './store';
|
||||
import { addItem, deleteItemById } from './todoSlice';
|
||||
|
||||
export const TodoList: React.FC = () => {
|
||||
const [inputText, setInputText] = useState('');
|
||||
|
||||
// Strongly type dispatch and select the state
|
||||
const dispatch = useDispatch<AppDispatch>();
|
||||
const items = useSelector((state: RootState) => state.todos.items);
|
||||
|
||||
const handleAdd = () => {
|
||||
if (!inputText.trim()) return;
|
||||
|
||||
dispatch(
|
||||
addItem({
|
||||
id: crypto.randomUUID(), // Generates a unique string ID
|
||||
text: inputText,
|
||||
})
|
||||
);
|
||||
setInputText('');
|
||||
};
|
||||
|
||||
return (
|
||||
<div>
|
||||
<input
|
||||
value={inputText}
|
||||
onChange={(e) => setInputText(e.target.value)}
|
||||
placeholder="Enter item..."
|
||||
/>
|
||||
<button onClick={handleAdd}>Add Item</button>
|
||||
|
||||
<ul>
|
||||
{items.map((item) => (
|
||||
<li key={item.id}>
|
||||
{item.text}
|
||||
<button onClick={() => dispatch(deleteItemById(item.id))}>
|
||||
Delete
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 8.5 KiB |
@@ -0,0 +1,42 @@
|
||||
.app-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 1rem 2rem;
|
||||
background-color: #ffffff;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.header-nav {
|
||||
display: flex;
|
||||
gap: 1.5rem;
|
||||
}
|
||||
|
||||
.header-nav a {
|
||||
text-decoration: none;
|
||||
color: #333;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.header-nav a:hover {
|
||||
color: #007bff;
|
||||
}
|
||||
|
||||
.header-actions button {
|
||||
padding: 0.5rem 1rem;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.login-btn {
|
||||
background-color: #007bff;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.logout-btn {
|
||||
background-color: #f8f9fa;
|
||||
border: 1px solid #ccc;
|
||||
color: #333;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
import React from 'react';
|
||||
import './Header.css';
|
||||
|
||||
// Define the types for the props
|
||||
interface HeaderProps {
|
||||
title: string;
|
||||
onLogout?: () => void; // Optional function for a logout button
|
||||
}
|
||||
|
||||
export const Header: React.FC<HeaderProps> = ({ title, onLogout }) => {
|
||||
return (
|
||||
<header className="app-header">
|
||||
<div className="header-logo">
|
||||
<h1>{title}</h1>
|
||||
</div>
|
||||
|
||||
<nav className="header-nav">
|
||||
<a href="/home">Home</a>
|
||||
<a href="/adminuser">Admin User</a>
|
||||
<a href="/validationpoint">Validation Point</a>
|
||||
</nav>
|
||||
|
||||
<div className="header-actions">
|
||||
{onLogout ? (
|
||||
<button onClick={onLogout} className="logout-btn">
|
||||
Log Out
|
||||
</button>
|
||||
) : (
|
||||
<button className="login-btn">Log In</button>
|
||||
)}
|
||||
</div>
|
||||
</header>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,151 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import {type ConcessionType } from '../models';
|
||||
import { concessionTypeService} from '../services';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
export default function ConcessionTypeApp() {
|
||||
const navigate = useNavigate();
|
||||
const empty: ConcessionType =
|
||||
{
|
||||
id: -1,
|
||||
description: '',
|
||||
display: '',
|
||||
active: false
|
||||
};
|
||||
const [list, setList] = useState<ConcessionType[]>([]);
|
||||
const [form, setForm] = useState(empty);
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
|
||||
// READ: Fetch all list
|
||||
useEffect(() => {
|
||||
fecthValidationPoint();
|
||||
}, []);
|
||||
const fecthValidationPoint = async () => {
|
||||
try{
|
||||
const vpres = await concessionTypeService.get();
|
||||
if (vpres.statusCode == 1)
|
||||
setList(vpres.data);
|
||||
}
|
||||
catch (error) {
|
||||
console.error('error loading Validation Point', error);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// INPUT HANDLER
|
||||
const handleInputChange = (e: { target: { name: any; value: any; }; }) => {
|
||||
const { name, value } = e.target;
|
||||
setForm({ ...form, [name]: value });
|
||||
setIsEditing(true);
|
||||
};
|
||||
// INPUT HANDLER
|
||||
const handleCheckChange = (e: { target: { name: any; checked:any }; }) => {
|
||||
const { name, checked } = e.target;
|
||||
|
||||
setForm({ ...form, [name]: checked });
|
||||
setIsEditing(true);
|
||||
};
|
||||
|
||||
// CREATE & UPDATE: Submit handler
|
||||
const handleSubmit = async (e: { preventDefault: () => void; }) => {
|
||||
console.log("on submit handle", isEditing,form);
|
||||
e.preventDefault();
|
||||
if (!form.description ) return alert('Please fill in all fields');
|
||||
|
||||
if (isEditing) {
|
||||
// SAVE (create/update)
|
||||
try {
|
||||
const oid = form.id;
|
||||
const nid = await concessionTypeService.save(form);
|
||||
if (nid.statusCode == 1) {
|
||||
form.id = nid.data;
|
||||
if (oid < 1)
|
||||
{
|
||||
const nlist = list;
|
||||
nlist.push(form);
|
||||
setList(nlist);
|
||||
}
|
||||
else
|
||||
setList(list.map(c => c.id === form.id ? form : c));
|
||||
clearForm();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error updating customer:', error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// DELETE
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
const respose = await concessionTypeService.delete(id);
|
||||
if (respose.data > 0)
|
||||
setList(list.filter(c => c.id !== id));
|
||||
else
|
||||
console.error('something is wrong', respose);
|
||||
} catch (error) {
|
||||
console.error('Error deleting customer:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// UTILITIES
|
||||
const handleNavClick = (item:ConcessionType) => {
|
||||
// setForm(item);
|
||||
// setIsEditing(true);
|
||||
navigate(`/concessiontype/${item.id}`);
|
||||
};
|
||||
// UTILITIES
|
||||
const handleEditClick = (item:ConcessionType) => {
|
||||
setForm(item);
|
||||
setIsEditing(true);
|
||||
|
||||
};
|
||||
const clearForm = () => {
|
||||
setForm(empty);
|
||||
setIsEditing(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className='p-5'>
|
||||
<h2>ConcessionType Management (CRUD)</h2>
|
||||
|
||||
{/* FORM COMPONENT */}
|
||||
<form onSubmit={handleSubmit} style={{ marginBottom: '20px', display: 'flex', gap: '10px' }}>
|
||||
<input
|
||||
type="text" name="description" placeholder="description"
|
||||
value={form.description} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="text" name="display" placeholder="display"
|
||||
value={form.display} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="checkbox" name="active" placeholder="Active"
|
||||
checked={form.active} onChange={handleCheckChange}
|
||||
/>
|
||||
|
||||
|
||||
<button type="submit">{isEditing ? 'Update' : 'Add'}</button>
|
||||
{isEditing && <button type="button" onClick={clearForm}>Cancel</button>}
|
||||
</form>
|
||||
|
||||
{/* LIST COMPONENT */}
|
||||
<ul style={{ listStyle: 'none', padding: 0 }}>
|
||||
{list.map(item => (
|
||||
<li key={item.id} style={
|
||||
{ padding: '10px', borderBottom: '1px solid #ccc',
|
||||
display: 'flex', justifyContent: 'space-between' }}>
|
||||
<div>
|
||||
<strong>{item.description}</strong> ({item.display}) - {item.active ? "True": "False"}
|
||||
</div>
|
||||
<div>
|
||||
<button onClick={() => handleNavClick(item)} style={{ marginRight: '5px' }}>Navigate</button>
|
||||
<button onClick={() => handleEditClick(item)} style={{ marginRight: '5px' }}>Edit</button>
|
||||
<button onClick={() => handleDelete(item.id)}>Delete</button>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
// components/UserProfile.tsx
|
||||
import { useParams } from 'react-router-dom';
|
||||
import { useFormik } from 'formik';
|
||||
import * as Yup from 'yup';
|
||||
import type { ConcessionType } from '../models';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { concessionTypeService } from '../services';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
type RouteParams = {
|
||||
id: string;
|
||||
};
|
||||
|
||||
// 1. Set the initial form states based on the interface
|
||||
export default function EditConcessionTypeApp() {
|
||||
console.log(" 1 edit concession type ");
|
||||
// useParams returns a partial object, so explicitly cast or type it
|
||||
const navigate = useNavigate();
|
||||
|
||||
/*
|
||||
const handleFormSave = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!id) return;
|
||||
|
||||
const result = await dispatch(updateCustomerApi({ id, name, email, purchaseHistory: history }));
|
||||
if (updateCustomerApi.fulfilled.match(result)) {
|
||||
alert('Records successfully committed.');
|
||||
navigate('/customers');
|
||||
}
|
||||
};
|
||||
*/
|
||||
const initialValues: ConcessionType =
|
||||
{
|
||||
id: 0,
|
||||
description: '',
|
||||
display: '',
|
||||
active: false
|
||||
};
|
||||
const [initialFormValues, setInitialFormValues] = useState<ConcessionType>(initialValues);
|
||||
const [isLoading, setIsLoading] = useState<boolean>(true);
|
||||
|
||||
|
||||
const { id } = useParams<RouteParams>();
|
||||
// 3. Fetch existing record data on mount or when the ID changes
|
||||
useEffect(() => {
|
||||
|
||||
const fetchExistingRecord = async () => {
|
||||
try {
|
||||
setIsLoading(true);
|
||||
const iid = parseInt(id ?? '0');
|
||||
if (iid > 0) {
|
||||
// Replace this with your actual Axios, Fetch, or SDK call
|
||||
const response = await concessionTypeService.getById(iid);
|
||||
if (response.statusCode == 1)
|
||||
// Update state with the fetched record
|
||||
setInitialFormValues(response.data);
|
||||
}
|
||||
else {
|
||||
initialFormValues.id = -1;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch the record data:', error);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
fetchExistingRecord();
|
||||
}, [id]);
|
||||
|
||||
const formik = useFormik<ConcessionType>({
|
||||
initialValues: initialFormValues,
|
||||
enableReinitialize: true, // Ensures form updates when state fills
|
||||
validationSchema: Yup.object({
|
||||
description: Yup.string().required('description field cannot be blank'),
|
||||
}),
|
||||
onSubmit: async (data) => {
|
||||
// alert(values.description);
|
||||
const res = await concessionTypeService.save(data);
|
||||
if (res.statusCode == 1)
|
||||
alert('save success');
|
||||
|
||||
navigate(-1);
|
||||
},
|
||||
});
|
||||
|
||||
if (isLoading) {
|
||||
return <div>Loading your record info...</div>;
|
||||
}
|
||||
|
||||
// return <h1>Edit Concession Type from React Router: {id}</h1>;
|
||||
return (
|
||||
|
||||
<form onSubmit={formik.handleSubmit} >
|
||||
<label>Edit Concession Type</label>
|
||||
<div className='grid grid-cols-2 gap-2'>
|
||||
<input
|
||||
id="description"
|
||||
name="description"
|
||||
type="text"
|
||||
onChange={formik.handleChange}
|
||||
onBlur={formik.handleBlur}
|
||||
value={formik.values.description}
|
||||
/>
|
||||
{formik.touched.description && formik.errors.description ? (
|
||||
<div>{formik.errors.description}</div>
|
||||
) : null}
|
||||
<input
|
||||
id="display"
|
||||
name="display"
|
||||
type="text"
|
||||
onChange={formik.handleChange}
|
||||
onBlur={formik.handleBlur}
|
||||
value={formik.values.display}
|
||||
/>
|
||||
</div>
|
||||
<div className='ml-2 mt-2'>
|
||||
<input
|
||||
id="active"
|
||||
name="active"
|
||||
type="checkbox"
|
||||
onChange={formik.handleChange}
|
||||
onBlur={formik.handleBlur}
|
||||
checked={formik.values.active}
|
||||
/>
|
||||
<label htmlFor="active" className='ml-2'>Active</label>
|
||||
</div>
|
||||
<button className='flex ml-auto' type="submit">Submit</button>
|
||||
</form>
|
||||
);
|
||||
|
||||
};
|
||||
|
||||
/* navigate to edit page
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
interface UserButtonProps {
|
||||
id: string | number;
|
||||
}
|
||||
|
||||
export default function UserButton({ id }: UserButtonProps) {
|
||||
const navigate = useNavigate();
|
||||
|
||||
const handleClick = () => {
|
||||
// Navigates to /users/42 using template literals
|
||||
navigate(`/users/${id}`);
|
||||
};
|
||||
|
||||
return <button onClick={handleClick}>View Profile</button>;
|
||||
*/
|
||||
@@ -0,0 +1,176 @@
|
||||
import React,{ useState, useEffect } from 'react';
|
||||
import { type ConcessionValidationDto } from '../models';
|
||||
import { concessionvalidationService as concessService} from '../services';
|
||||
import { DataTable } from 'primereact/datatable';
|
||||
import { Button } from 'primereact/button';
|
||||
import { Column } from 'primereact/column';
|
||||
import { ConfirmDialog, confirmDialog } from 'primereact/confirmdialog';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import moment from 'moment';
|
||||
|
||||
|
||||
export default function ConcessionValidationApp() {
|
||||
const navigate = useNavigate();
|
||||
|
||||
const empty: ConcessionValidationDto =
|
||||
{
|
||||
id: 0,
|
||||
validateDate: '',
|
||||
concessionCard: '',
|
||||
concessionHolder: '',
|
||||
concessionExpiry: false,
|
||||
concessionTypeId: 0,
|
||||
stafflinkNo: '',
|
||||
validationPointId: 0,
|
||||
active: false,
|
||||
staffFirstName: '',
|
||||
staffLastName: '',
|
||||
staffEmail: '',
|
||||
iDate: new Date()
|
||||
};
|
||||
const [list, setList] = useState<ConcessionValidationDto[]>([]);
|
||||
const [form, setForm] = useState(empty);
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
|
||||
// READ: Fetch all list
|
||||
useEffect(() => {
|
||||
fecthValidationPoint();
|
||||
}, []);
|
||||
const fecthValidationPoint = async () => {
|
||||
try{
|
||||
const vpres = await concessService.get();
|
||||
if (vpres.statusCode == 1)
|
||||
setList(vpres.data);
|
||||
}
|
||||
catch (error) {
|
||||
console.error('error loading Validation Point', error);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// CREATE & UPDATE: Submit handler
|
||||
const handleSubmit = async (e: { preventDefault: () => void; }) => {
|
||||
console.log("on submit handle", isEditing,form);
|
||||
e.preventDefault();
|
||||
if (!form.concessionHolder ) return alert('Please fill in all fields');
|
||||
|
||||
if (isEditing) {
|
||||
// SAVE (create/update)
|
||||
try {
|
||||
const nid = await concessService.save(form);
|
||||
form.id = nid.data;
|
||||
setList(list.map(c => c.id === form.id ? form : c));
|
||||
clearForm();
|
||||
} catch (error) {
|
||||
console.error('Error updating customer:', error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// DELETE
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
const respose = await concessService.delete(id);
|
||||
if (respose.data > 0)
|
||||
setList(list.filter(c => c.id !== id));
|
||||
else
|
||||
console.error('something is wrong', respose);
|
||||
} catch (error) {
|
||||
console.error('Error deleting customer:', error);
|
||||
}
|
||||
};
|
||||
const formatDate = (value:string) => {
|
||||
return moment(value).format('DD-MM-YYYY');
|
||||
};
|
||||
const dateBodyTemplate = (rowData:ConcessionValidationDto) => {
|
||||
return formatDate(rowData.validateDate);
|
||||
};
|
||||
const handleEditClick = (item:ConcessionValidationDto) => {
|
||||
// setForm(item);
|
||||
// setIsEditing(true);
|
||||
handleNavClick(item.id);
|
||||
};
|
||||
|
||||
const confirmDelete = (item: ConcessionValidationDto) => {
|
||||
confirmDialog({
|
||||
message: 'Do you want to delete this record?',
|
||||
header: 'Delete Confirmation',
|
||||
icon: 'pi pi-info-circle',
|
||||
defaultFocus: 'reject',
|
||||
acceptClassName: 'p-button-danger',
|
||||
accept() {
|
||||
handleDelete(item.id);
|
||||
},
|
||||
});
|
||||
|
||||
// setForm(product);
|
||||
// setDeleteProductDialog(true);
|
||||
};
|
||||
const handleNavClick = (id: number) => {
|
||||
// setForm(item);
|
||||
// setIsEditing(true);
|
||||
navigate(`/concessionvalidation/${id}`);
|
||||
};
|
||||
const clearForm = () => {
|
||||
setForm(empty);
|
||||
setIsEditing(false);
|
||||
};
|
||||
const actionBodyTemplate = (rowData: ConcessionValidationDto) => {
|
||||
return (
|
||||
<React.Fragment>
|
||||
<div className='flex gap-2'>
|
||||
<Button icon="pi pi-pencil" rounded outlined className='flex mr-2'
|
||||
onClick={() => handleEditClick(rowData)} />
|
||||
<Button icon="pi pi-trash" rounded outlined severity="danger" onClick={() => confirmDelete(rowData)} />
|
||||
</div>
|
||||
</React.Fragment>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className='m-4 grid gap-2'>
|
||||
<ConfirmDialog />
|
||||
<h2>Concession Validation Management (CRUD)</h2>
|
||||
|
||||
{/* FORM COMPONENT
|
||||
<form onSubmit={handleSubmit} style={{ marginBottom: '20px', display: 'flex', gap: '10px' }}>
|
||||
<input
|
||||
type="text" name="concessionCard" placeholder="concessionCard"
|
||||
value={form.concessionCard} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="text" name="concessionHolder" placeholder="concessionHolder"
|
||||
value={form.concessionHolder} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="text" name="concessionCard" placeholder="concessionCard"
|
||||
value={form.concessionCard} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="checkbox" name="concessionExpiry" placeholder="concessionExpiry"
|
||||
checked={form.concessionExpiry} onChange={handleCheckChange}
|
||||
/>
|
||||
|
||||
|
||||
<button type="submit">{isEditing ? 'Update' : 'Add'}</button>
|
||||
{isEditing && <button type="button" onClick={clearForm}>Cancel</button>}
|
||||
</form>
|
||||
*/}
|
||||
<div className='flex justify-end'>
|
||||
<button onClick={() => handleNavClick(-1)}>Add New</button>
|
||||
</div>
|
||||
{/* LIST COMPONENT */}
|
||||
<DataTable value={list} tableStyle={{ minWidth: '50rem' }}>
|
||||
|
||||
<Column field="concessionCard" header="Concession Card"></Column>
|
||||
<Column field="concessionHolder" header="Concession Holder"></Column>
|
||||
<Column field="validateDate" body={dateBodyTemplate} header="Validation Date"></Column>
|
||||
<Column field="concessionExpiry" header="Expiry"></Column>
|
||||
<Column body={actionBodyTemplate} exportable={false} style={{ minWidth: '12rem' }}></Column>
|
||||
</DataTable>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,242 @@
|
||||
// components/UserProfile.tsx
|
||||
import { useParams } from 'react-router-dom';
|
||||
import { useFormik } from 'formik';
|
||||
import * as Yup from 'yup';
|
||||
import { Dropdown } from 'primereact/dropdown';
|
||||
import { Calendar } from 'primereact/calendar';
|
||||
import type { ConcessionType, ConcessionValidationDto } from '../models';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { concessionvalidationService as concessService } from '../services';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { Utils } from '../share';
|
||||
//import { concessionTypeService } from '../services';
|
||||
import moment from 'moment';
|
||||
import { useAppSelector, useAppDispatch } from '../store/hook';
|
||||
//import { type RootState } from '../store/store';
|
||||
import { funThunkLoadConcessionType, funThunkLoadValidationPoint } from '../store/slice';
|
||||
|
||||
type RouteParams = {
|
||||
id: string;
|
||||
};
|
||||
|
||||
// 1. Set the initial form states based on the interface
|
||||
export default function EditConcessionValidationApp() {
|
||||
// useParams returns a partial object, so explicitly cast or type it
|
||||
const { id } = useParams<RouteParams>();
|
||||
const navigate = useNavigate();
|
||||
const dispatch = useAppDispatch();
|
||||
const conTypeList = useAppSelector(state => state.concessionTypeRE.concessionTypes);
|
||||
const validationPointList = useAppSelector(state => state.concessionTypeRE.validationPoints);
|
||||
|
||||
console.log(" 1 get login ");
|
||||
const loginUser = Utils.getLogin();
|
||||
console.log(" 2 get login ");
|
||||
// const dispatch = useAppDispatch();
|
||||
// State elements are automatically typed based on the store schema
|
||||
//const { concessionTypes } = useAppSelector((state: RootState) => state.convalidation);
|
||||
const initialValues: ConcessionValidationDto =
|
||||
{
|
||||
id: -1,
|
||||
validateDate: '',
|
||||
iDate: new Date(),
|
||||
concessionCard: '',
|
||||
concessionHolder: '',
|
||||
concessionExpiry: false,
|
||||
concessionTypeId: 0,
|
||||
active: true,
|
||||
/*
|
||||
stafflinkNo: "",
|
||||
validationPointId: 0,
|
||||
staffFirstName: "",
|
||||
staffLastName: "",
|
||||
staffEmail: "",
|
||||
*/
|
||||
|
||||
|
||||
stafflinkNo: loginUser.username ?? "",
|
||||
validationPointId: loginUser.validationPointId ?? 0,
|
||||
staffFirstName: loginUser.firstName,
|
||||
staffLastName: loginUser.lastName,
|
||||
staffEmail: loginUser.email,
|
||||
|
||||
|
||||
|
||||
};
|
||||
const iid = parseInt(id ?? '0');
|
||||
const [isLoading, setIsLoading] = useState<boolean>(true);
|
||||
const [initialFormValues, setInitialFormValues] = useState<ConcessionValidationDto>(initialValues);
|
||||
//const [conTypeList, setconTypeList] = useState<ConcessionType[]>([]);
|
||||
|
||||
const fetchExistingRecord = async () => {
|
||||
try {
|
||||
setIsLoading(true);
|
||||
|
||||
if (iid > 0) {
|
||||
// Replace this with your actual Axios, Fetch, or SDK call
|
||||
const response = await concessService.getById(iid);
|
||||
if (response.statusCode == 1)
|
||||
// Update state with the fetched record
|
||||
setInitialFormValues(response.data);
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
console.error('Failed to fetch the record data:', error);
|
||||
|
||||
} finally {
|
||||
|
||||
setIsLoading(false);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
fetchExistingRecord();
|
||||
if (conTypeList.length < 1)
|
||||
dispatch(funThunkLoadValidationPoint());
|
||||
if (validationPointList.length < 1)
|
||||
dispatch(funThunkLoadConcessionType());
|
||||
return () => {
|
||||
// isMounted = false;
|
||||
// dispatch(clearConcessionType());
|
||||
};
|
||||
}, [iid, dispatch]);
|
||||
|
||||
|
||||
//if (concessionTypes != null)
|
||||
// setconTypeList(concessionTypes);
|
||||
/*
|
||||
const fecthConcessionType = async () => {
|
||||
try {
|
||||
const vpres = await concessionTypeService.get();
|
||||
if (vpres.statusCode == 1)
|
||||
setconTypeList(vpres.data);
|
||||
}
|
||||
catch (error) {
|
||||
console.error('error loading Validation Point', error);
|
||||
}
|
||||
};
|
||||
*/
|
||||
|
||||
const formik = useFormik<ConcessionValidationDto>({
|
||||
initialValues: initialFormValues,
|
||||
enableReinitialize: true, // Ensures form updates when state fills
|
||||
validationSchema: Yup.object({
|
||||
concessionCard: Yup.string().required('concessionCard field cannot be blank'),
|
||||
}),
|
||||
onSubmit: async (data) => {
|
||||
/* using redux thunk *****
|
||||
***********************************************************
|
||||
// 1. Dispatch and wait for the thunk to complete
|
||||
const resultAction = await dispatch(updateCustomerApi({ name, email, purchaseHistory }));
|
||||
|
||||
// 2. Unwrap the action payload safely
|
||||
if (updateCustomerApi.fulfilled.match(resultAction)) {
|
||||
// The fresh server response is inside the action payload directly!
|
||||
const myNewId = resultAction.payload.id;
|
||||
console.log("Got the new ID immediately:", myNewId);
|
||||
*************************************************************
|
||||
|
||||
option two
|
||||
// 1. Keep your selector at the top-level of the component
|
||||
const myNewId = useAppSelector((state) => state.customer.activeItem?.id);
|
||||
|
||||
// 2. Submit handler only triggers the mutation
|
||||
const handleSubmit = (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
dispatch(triggerIdGenerationAction());
|
||||
};
|
||||
|
||||
// 3. Effect listens for the variable to change on subsequent renders
|
||||
useEffect(() => {
|
||||
if (myNewId) {
|
||||
console.log("State updated! Moving to next screen with ID:", myNewId);
|
||||
navigate(`/receipt/${myNewId}`);
|
||||
}
|
||||
}, [myNewId, navigate]); // Fires automatically when myNewId changes
|
||||
***************************************************************************
|
||||
*/
|
||||
|
||||
|
||||
// alert(values.description);
|
||||
console.log('on submit', data);
|
||||
data.validateDate = moment(data.iDate).format('YYYY-MM-DD');
|
||||
const res = await concessService.save(data);
|
||||
if (res.statusCode == 1)
|
||||
alert('save success');
|
||||
navigate(-1);
|
||||
},
|
||||
});
|
||||
|
||||
if (isLoading) {
|
||||
return <div>Loading your record info...</div>;
|
||||
}
|
||||
|
||||
|
||||
// return <h1>Edit Concession Type from React Router: {id}</h1>;
|
||||
return (
|
||||
|
||||
<form onSubmit={formik.handleSubmit} >
|
||||
<label>Edit Concession Validation</label>
|
||||
<div className='grid grid-cols-2 gap-2'>
|
||||
<input
|
||||
id="concessionCard"
|
||||
name="concessionCard"
|
||||
type="text"
|
||||
onChange={formik.handleChange}
|
||||
onBlur={formik.handleBlur}
|
||||
placeholder='Card'
|
||||
value={formik.values.concessionCard}
|
||||
/>
|
||||
{formik.touched.concessionCard && formik.errors.concessionCard ? (
|
||||
<div>{formik.errors.concessionCard}</div>
|
||||
) : null}
|
||||
<input
|
||||
id="concessionHolder"
|
||||
name="concessionHolder"
|
||||
type="text"
|
||||
placeholder='Card Holder'
|
||||
onChange={formik.handleChange}
|
||||
onBlur={formik.handleBlur}
|
||||
value={formik.values.concessionHolder}
|
||||
/>
|
||||
<Calendar value={formik.values.iDate} onChange={(e) => formik.setFieldValue('iDate', e.value)} dateFormat="dd/mm/yy" />
|
||||
</div>
|
||||
<div className='ml-2 mt-2'>
|
||||
<input
|
||||
id="concessionExpiry"
|
||||
name="concessionExpiry"
|
||||
type="checkbox"
|
||||
onChange={formik.handleChange}
|
||||
onBlur={formik.handleBlur}
|
||||
checked={formik.values.concessionExpiry}
|
||||
/>
|
||||
<label htmlFor="concessionExpiry" className='ml-2'>Expiry</label>
|
||||
<Dropdown value={formik.values.concessionTypeId} onChange={(e) => formik.setFieldValue('concessionTypeId', e.value)}
|
||||
options={conTypeList} optionLabel="description" optionValue="id"
|
||||
placeholder="Select a concession Type" className="w-full md:w-14rem" />
|
||||
<Dropdown value={formik.values.validationPointId} onChange={(e) => formik.setFieldValue('validationPointId', e.value)}
|
||||
options={validationPointList} optionLabel="description" optionValue="id"
|
||||
placeholder="Select a concession Type" className="w-full md:w-14rem" />
|
||||
</div>
|
||||
<button className='flex ml-auto mt-2' type="submit">Submit</button>
|
||||
</form>
|
||||
);
|
||||
};
|
||||
|
||||
/* navigate to edit page
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
interface UserButtonProps {
|
||||
id: string | number;
|
||||
}
|
||||
|
||||
export default function UserButton({ id }: UserButtonProps) {
|
||||
const navigate = useNavigate();
|
||||
|
||||
const handleClick = () => {
|
||||
// Navigates to /users/42 using template literals
|
||||
navigate(`/users/${id}`);
|
||||
};
|
||||
|
||||
return <button onClick={handleClick}>View Profile</button>;
|
||||
*/
|
||||
Vendored
+9
@@ -0,0 +1,9 @@
|
||||
export {};
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
APP_CONFIG?: {
|
||||
API_URL?: string;
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
import { useNavigate } from "react-router-dom";
|
||||
|
||||
export default function Home() {
|
||||
const navigate = useNavigate();
|
||||
return (
|
||||
<>
|
||||
<h2>Home Page</h2>
|
||||
<div className='grid grid-cols-4 gap-2 mt-4'>
|
||||
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
|
||||
onClick={() => navigate("/concessiontype")}
|
||||
type="button">Concession Typed</button>
|
||||
|
||||
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
|
||||
onClick={() => navigate("/concessionvalidation")}
|
||||
type="button">Concession Validation</button>
|
||||
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
|
||||
onClick={() => navigate("/validationpoint")}
|
||||
type="button">Validation Point</button>
|
||||
<button className='mt-2 rounded-xl border-2 bg-blue-500 cursor-pointer'
|
||||
onClick={() => navigate("/adminuser")}
|
||||
type="button">Admin User</button>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export * from "./home";
|
||||
@@ -0,0 +1,22 @@
|
||||
@import "tailwindcss";
|
||||
@import 'primeicons/primeicons.css';
|
||||
/* Add this to your global CSS file */
|
||||
input {
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
padding: 8px;
|
||||
}
|
||||
select {
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
}
|
||||
button {
|
||||
border: 1px solid #007bff;
|
||||
/*
|
||||
background-color: #007bff;
|
||||
color: white;
|
||||
*/
|
||||
border-radius: 4px;
|
||||
padding: 8px 16px;
|
||||
cursor: pointer;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
import React from 'react';
|
||||
import { Outlet } from 'react-router-dom';
|
||||
import { Header } from '../components/Header';
|
||||
import { useAuth } from '../share';
|
||||
|
||||
export const MainLayout: React.FC = () => {
|
||||
const { logout } = useAuth();
|
||||
const handleLogout = () => {
|
||||
// Add your AuthProvider logout logic here
|
||||
logout();
|
||||
console.log('Logging out...');
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="app-container">
|
||||
<Header title="Car Park Validation" onLogout={handleLogout} />
|
||||
<main className="main-content" style={{ padding: '2rem' }}>
|
||||
{/* This renders the actual page component (Home, Admin, etc.) */}
|
||||
<Outlet />
|
||||
</main>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,76 @@
|
||||
import React, { useState } from 'react';
|
||||
import { useNavigate, useLocation } from 'react-router-dom';
|
||||
import { InputText } from 'primereact/inputtext';
|
||||
import { useAuth } from '../share';
|
||||
import { Button } from 'primereact/button';
|
||||
import { adminUserService } from '../services';
|
||||
export default function Login() {
|
||||
let loggingIn = false;
|
||||
const empty =
|
||||
{
|
||||
username: '',
|
||||
password: ''
|
||||
};
|
||||
const [form, setForm] = useState(empty);
|
||||
const { login,isAuthenticated} = useAuth();
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const [submitted, setSubmitted] = useState(false);
|
||||
|
||||
|
||||
// Retrieve the original destination path, defaulting to the dashboard
|
||||
const from = location.state?.from?.pathname || '/home';
|
||||
|
||||
// INPUT HANDLER
|
||||
const handleInputChange = (e: { target: { name: any; value: any; }; }) => {
|
||||
const { name, value } = e.target;
|
||||
setForm({ ...form, [name]: value });
|
||||
};
|
||||
|
||||
const handleFormSubmit = async (e: React.ChangeEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
try {
|
||||
// Replace this section with your actual API fetch request
|
||||
const loginUser = await adminUserService.login(form.username,form.password);
|
||||
if (loginUser.statusCode == 1)
|
||||
{
|
||||
// Saves to state and localStorage
|
||||
login(loginUser.data);
|
||||
// Redirects user back to their intended protected page
|
||||
navigate(from, { replace: true });
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Login failed', error);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="flex justify-center">
|
||||
<div className='shadow-2 rounded p-2'>
|
||||
<h2>Login</h2>
|
||||
<form name="form" onSubmit={handleFormSubmit}>
|
||||
<div className={'field' + (submitted && !isAuthenticated ? ' has-error' : '')}>
|
||||
<label htmlFor="username">Username</label>
|
||||
<InputText id="username" type="text" className="p-inputtext-sm inputfield w-full border-round"
|
||||
name="username" value={form.username} onChange={handleInputChange} />
|
||||
{submitted && !isAuthenticated &&
|
||||
<div className="help-block">Username is required</div>
|
||||
}
|
||||
</div>
|
||||
<div className={'field' + (submitted && !form.password ? ' has-error' : '')}>
|
||||
<label htmlFor="password">Password</label>
|
||||
<InputText id="password" type="password" className="p-inputtext-sm inputfield w-full border-round"
|
||||
name="password" value={form.password} onChange={handleInputChange} />
|
||||
{submitted && !form.password &&
|
||||
<div className="help-block">Password is required</div>
|
||||
}
|
||||
</div>
|
||||
<div className="flex justify-end mt-2">
|
||||
<Button className="p-button-sm p-button-rounded" type="submit" label="Login" loading={loggingIn} style={{height: "30px"}} />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
//import { StrictMode } from 'react'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import './index.css'
|
||||
import App from './App.tsx'
|
||||
import { PrimeReactProvider } from 'primereact/api';
|
||||
import { Provider } from 'react-redux';
|
||||
import { store } from './store';
|
||||
|
||||
// Fetch config from the public folder at runtime
|
||||
fetch('/config.json')
|
||||
.then((response) => response.json())
|
||||
.then((config) => {
|
||||
// Store it globally on the window object
|
||||
//(window as any).APP_CONFIG = 'abc';
|
||||
window.APP_CONFIG = config;
|
||||
createRoot(document.getElementById('root')!).render(
|
||||
//<StrictMode>
|
||||
<Provider store={store}>
|
||||
<PrimeReactProvider>
|
||||
<App />
|
||||
</PrimeReactProvider>
|
||||
</Provider>
|
||||
//</StrictMode>,
|
||||
)
|
||||
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Failed to load runtime configuration:', error);
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
import { AdminRole } from "./enum";
|
||||
|
||||
export interface AdminUserDto {
|
||||
id: number;
|
||||
stafflinkNo: string;
|
||||
lastName: string;
|
||||
firstName: string;
|
||||
addedOn: string;
|
||||
active: boolean;
|
||||
roleType: AdminRole;
|
||||
validationPointId: number;
|
||||
}
|
||||
|
||||
export interface User {
|
||||
stafflinkNo: string;
|
||||
name: string;
|
||||
token: string;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
import type {User } from "./user";
|
||||
|
||||
// Define the shape of the Context
|
||||
export interface AuthContextType {
|
||||
user: User | null;
|
||||
login: (userData: User) => void;
|
||||
logout: () => void;
|
||||
isAuthenticated: boolean;
|
||||
};
|
||||
@@ -0,0 +1,12 @@
|
||||
import { AdminRole } from "./enum";
|
||||
|
||||
export interface AuthenticateResponse {
|
||||
id: number;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
username: string;
|
||||
role: AdminRole;
|
||||
validationPointId: number;
|
||||
token: string;
|
||||
email: string;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
export interface ConcessionType {
|
||||
id: number ;
|
||||
description: string ;
|
||||
display: string ;
|
||||
active: boolean ;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
export interface ConcessionValidationDto {
|
||||
id: number;
|
||||
validateDate: string;
|
||||
iDate: Date;
|
||||
concessionCard: string;
|
||||
concessionHolder: string;
|
||||
concessionExpiry: boolean;
|
||||
concessionTypeId: number;
|
||||
stafflinkNo: string;
|
||||
validationPointId: number;
|
||||
active: boolean;
|
||||
staffFirstName: string;
|
||||
staffLastName: string;
|
||||
staffEmail: string;
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
export enum AdminRole {
|
||||
Normal = 1,
|
||||
Admin = 2
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
export * from './login';
|
||||
export * from './authcontexttype';
|
||||
export * from './lookupdto';
|
||||
export * from './concessionType';
|
||||
export * from './enum';
|
||||
export * from './adminuser';
|
||||
export * from './concessionvalidation';
|
||||
export * from './validationpoint';
|
||||
export * from './resultmodel';
|
||||
export * from './authenticateResponse';
|
||||
export * from './storestate';
|
||||
@@ -0,0 +1,6 @@
|
||||
export interface Login
|
||||
{
|
||||
username: string;
|
||||
password: string;
|
||||
submitted: boolean;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
export interface Lookup {
|
||||
id: number | string;
|
||||
description: string | null;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
export interface ResultModel<T> {
|
||||
data: T;
|
||||
message: string;
|
||||
statusCode:number;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
import type { ConcessionType } from "./concessionType";
|
||||
import type { ValidationPointDto } from "./validationpoint";
|
||||
|
||||
export interface StoreState {
|
||||
concessionTypes: ConcessionType[];
|
||||
validationPoints: ValidationPointDto[];
|
||||
loading: boolean;
|
||||
error: string | null;
|
||||
newId: number | null;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
export interface ValidationPointDto {
|
||||
id: number;
|
||||
description: string;
|
||||
display: string;
|
||||
active: boolean;
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
// src/services/userService.js
|
||||
/*
|
||||
import axios from 'axios';
|
||||
|
||||
const api = axios.create({
|
||||
baseURL: 'https://your-api-domain.com',
|
||||
withCredentials: true // Crucial: Allows sending cookies
|
||||
});
|
||||
fetch('https://your-api-domain.com', {
|
||||
method: 'GET',
|
||||
credentials: 'include' // Crucial: Allows sending cookies
|
||||
});
|
||||
*/
|
||||
import type { AdminUserDto, AuthenticateResponse, ResultModel } from "../models";
|
||||
import { Utils } from "../share";
|
||||
|
||||
// Safely reads runtime variable established in the previous step
|
||||
const getBaseUrl = () => window.APP_CONFIG?.API_URL || 'http://localhost:123/api';
|
||||
|
||||
export const adminUserService = {
|
||||
//Login
|
||||
login : async(username: string, password:string) : Promise<ResultModel<AuthenticateResponse>> => {
|
||||
const data = {username, password};
|
||||
const response = await fetch(`${getBaseUrl()}/Users/LoginAD`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
credentials: 'include',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to create/update lookup');
|
||||
return response.json();
|
||||
},
|
||||
// READ
|
||||
get: async () : Promise<ResultModel<AdminUserDto[]>> => {
|
||||
const response = await fetch(`${getBaseUrl()}/AdminUser`);
|
||||
if (!response.ok) throw new Error('Failed to fetch lookup');
|
||||
return response.json();
|
||||
},
|
||||
|
||||
// create,update
|
||||
save: async (data: AdminUserDto): Promise<ResultModel<number>> => {
|
||||
const loginUser = Utils.getLogin();
|
||||
let token = '';
|
||||
if (loginUser)
|
||||
token = loginUser.token;
|
||||
const response = await fetch(`${getBaseUrl()}/AdminUser`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
headers: { 'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${token}` // The standard format for tokens
|
||||
},
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to create/update lookup');
|
||||
return response.json();
|
||||
},
|
||||
|
||||
|
||||
|
||||
// DELETE
|
||||
delete: async (id: number) : Promise<ResultModel<number>>=> {
|
||||
const response = await fetch(`${getBaseUrl()}/DeleteConcessionType/${id}`, {
|
||||
method: 'DELETE',
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to delete conssionType');
|
||||
return response.json();
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,46 @@
|
||||
// src/services/customerService.js
|
||||
|
||||
import type { ConcessionType, ResultModel } from "../models";
|
||||
import { Utils } from "../share";
|
||||
|
||||
// Safely reads runtime variable established in the previous step
|
||||
const getBaseUrl = () => window.APP_CONFIG?.API_URL || 'http://localhost:123/api';
|
||||
|
||||
export const concessionTypeService = {
|
||||
// READ
|
||||
get: async () : Promise<ResultModel<ConcessionType[]>> => {
|
||||
const response = await fetch(`${getBaseUrl()}/ConcessionType`);
|
||||
if (!response.ok) throw new Error('Failed to fetch lookup');
|
||||
return response.json();
|
||||
},
|
||||
getById: async (id: number) : Promise<ResultModel<ConcessionType>> => {
|
||||
const response = await fetch(`${getBaseUrl()}/ConcessionType/${id}`);
|
||||
if (!response.ok) throw new Error('Failed to fetch lookup');
|
||||
return response.json();
|
||||
},
|
||||
// create,update
|
||||
save: async (data: ConcessionType): Promise<ResultModel<number>> => {
|
||||
const loginUser = Utils.getLogin();
|
||||
let token = '';
|
||||
if (loginUser)
|
||||
token = loginUser.token;
|
||||
const response = await fetch(`${getBaseUrl()}/ConcessionType`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
headers: { 'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${token}` // The standard format for tokens
|
||||
},
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to create/update lookup');
|
||||
return response.json();
|
||||
},
|
||||
|
||||
// DELETE
|
||||
delete: async (id: number) : Promise<ResultModel<number>>=> {
|
||||
const response = await fetch(`${getBaseUrl()}/DeleteConcessionType/${id}`, {
|
||||
method: 'DELETE',
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to delete conssionType');
|
||||
return response.json();
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,47 @@
|
||||
// src/services/customerService.js
|
||||
|
||||
import type { ConcessionValidationDto, ResultModel } from "../models";
|
||||
import { Utils } from "../share";
|
||||
|
||||
// Safely reads runtime variable established in the previous step
|
||||
const getBaseUrl = () => window.APP_CONFIG?.API_URL || 'http://localhost:123/api';
|
||||
|
||||
export const concessionvalidationService = {
|
||||
// READ
|
||||
get: async () : Promise<ResultModel<ConcessionValidationDto[]>> => {
|
||||
const response = await fetch(`${getBaseUrl()}/ConcessionValidation`);
|
||||
if (!response.ok) throw new Error('Failed to fetch concessionValidation');
|
||||
return response.json();
|
||||
},
|
||||
getById: async (id:number) : Promise<ResultModel<ConcessionValidationDto>> => {
|
||||
const response = await fetch(`${getBaseUrl()}/ConcessionValidation/${id}`);
|
||||
if (!response.ok) throw new Error('Failed to fetch concessionValidation');
|
||||
return response.json();
|
||||
},
|
||||
|
||||
// create,update
|
||||
save: async (data: ConcessionValidationDto): Promise<ResultModel<number>> => {
|
||||
const loginUser = Utils.getLogin();
|
||||
let token = '';
|
||||
if (loginUser)
|
||||
token = loginUser.token;
|
||||
const response = await fetch(`${getBaseUrl()}/ConcessionValidation`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data),
|
||||
headers: { 'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${token}` // The standard format for tokens
|
||||
},
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to create/update concessionValidation');
|
||||
return response.json();
|
||||
},
|
||||
|
||||
// DELETE
|
||||
delete: async (id: number) : Promise<ResultModel<number>>=> {
|
||||
const response = await fetch(`${getBaseUrl()}/DeleteConcessionValidation/${id}`, {
|
||||
method: 'DELETE',
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to delete concessionValidation');
|
||||
return response.json();
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,4 @@
|
||||
export * from "./adminuserservice";
|
||||
export * from "./concessionservice";
|
||||
export * from "./concessionvalidationservice";
|
||||
export * from "./validationpointService"
|
||||
@@ -0,0 +1,44 @@
|
||||
// src/services/validationService.js
|
||||
import { Utils } from '../share/authcontext';
|
||||
import type { ValidationPointDto, ResultModel } from "../models";
|
||||
|
||||
// Safely reads runtime variable established in the previous step
|
||||
const getBaseUrl = () => window.APP_CONFIG?.API_URL || 'http://localhost:123/api';
|
||||
|
||||
export const validationpointService = {
|
||||
// READ
|
||||
get: async () : Promise<ResultModel<ValidationPointDto[]>> => {
|
||||
const response = await fetch(`${getBaseUrl()}/ValidationPoint`);
|
||||
if (!response.ok) throw new Error('Failed to fetch ValidationPoint');
|
||||
return response.json();
|
||||
},
|
||||
|
||||
// create,update
|
||||
save: async (data: ValidationPointDto): Promise<ResultModel<number>> => {
|
||||
const loginUser = Utils.getLogin();
|
||||
let token = '';
|
||||
if (loginUser)
|
||||
token = loginUser.token;
|
||||
// 'Authorization': `Bearer ${token}` // The standard format for tokens
|
||||
console.log('the token is ', token);
|
||||
const response = await fetch(`${getBaseUrl()}/ValidationPoint`, {
|
||||
method: 'POST',
|
||||
credentials: 'include',
|
||||
body: JSON.stringify(data),
|
||||
headers: { 'Content-Type': 'application/json',
|
||||
|
||||
},
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to create/update ValidationPointC');
|
||||
return response.json();
|
||||
},
|
||||
|
||||
// DELETE
|
||||
delete: async (id: number) : Promise<ResultModel<number>>=> {
|
||||
const response = await fetch(`${getBaseUrl()}/ValidationPoint/${id}`, {
|
||||
method: 'DELETE',
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to delete ValidationPointC');
|
||||
return response.json();
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,81 @@
|
||||
|
||||
import type { ReactNode } from 'react';
|
||||
import { createContext, useContext, useState } from 'react';
|
||||
import { AdminRole, type AuthContextType, type AuthenticateResponse } from '../models';
|
||||
|
||||
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
||||
export const AuthProvider = ({ children }: { children: ReactNode }) => {
|
||||
// Initialize state directly from localStorage to prevent screen flicker on refresh
|
||||
const [user, setUser] = useState<AuthenticateResponse | null>(() => {
|
||||
const savedUser = sessionStorage.getItem('auth_user');
|
||||
if (savedUser)
|
||||
return savedUser ? JSON.parse(savedUser) : null;
|
||||
else
|
||||
return null;
|
||||
});
|
||||
|
||||
const login = (userData: AuthenticateResponse) => {
|
||||
setUser(userData);
|
||||
sessionStorage.setItem('auth_user', JSON.stringify(userData));
|
||||
};
|
||||
|
||||
const logout = () => {
|
||||
setUser(null);
|
||||
sessionStorage.removeItem('auth_user');
|
||||
};
|
||||
|
||||
const isAuthenticated = !!user;
|
||||
|
||||
return (
|
||||
<AuthContext.Provider value={{ user, login, logout, isAuthenticated }}>
|
||||
{children}
|
||||
</AuthContext.Provider>
|
||||
);
|
||||
};
|
||||
|
||||
// Custom hook for consuming the context cleanly
|
||||
export const useAuth = () => {
|
||||
const context = useContext(AuthContext);
|
||||
if (!context) {
|
||||
throw new Error('useAuth must be used within an AuthProvider');
|
||||
}
|
||||
return context;
|
||||
};
|
||||
|
||||
export const Utils = {
|
||||
getLogin: () : AuthenticateResponse =>{
|
||||
const empty: AuthenticateResponse ={
|
||||
id: 0,
|
||||
firstName: '',
|
||||
lastName: '',
|
||||
username: '',
|
||||
role: AdminRole.Normal,
|
||||
validationPointId: 0,
|
||||
token: '',
|
||||
email: ''
|
||||
};
|
||||
const savedUser = sessionStorage.getItem('auth_user');
|
||||
if (savedUser)
|
||||
{
|
||||
const obj = JSON.parse(savedUser);
|
||||
console.log('the obj in get login ', obj);
|
||||
if (obj != null) {
|
||||
let myItem: AuthenticateResponse ={
|
||||
id: obj.id,
|
||||
firstName: obj.firstName,
|
||||
lastName: obj.lastName,
|
||||
username: obj.username,
|
||||
role: obj.role,
|
||||
validationPointId: obj.validationPointId,
|
||||
token: obj.token,
|
||||
email: obj.email
|
||||
};
|
||||
console.log(' return the obj in get login ', myItem, obj);
|
||||
return myItem;
|
||||
}
|
||||
return empty;
|
||||
}
|
||||
else
|
||||
return empty;
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,2 @@
|
||||
export * from './authcontext';
|
||||
export * from './routeprotest';
|
||||
@@ -0,0 +1,28 @@
|
||||
import React from 'react';
|
||||
import { Navigate, Outlet, useLocation } from 'react-router-dom';
|
||||
import { useAuth } from "./authcontext";
|
||||
|
||||
export const ProtectedRoute = () => {
|
||||
const { isAuthenticated } = useAuth();
|
||||
const location = useLocation();
|
||||
|
||||
// If not authenticated, redirect to /login but save the current location
|
||||
// so we can send the user back after they log in.
|
||||
if (!isAuthenticated) {
|
||||
return <Navigate to="/login" state={{ from: location }} replace />;
|
||||
}
|
||||
|
||||
// If authenticated, render the child routes
|
||||
return <Outlet />;
|
||||
};
|
||||
|
||||
export const PublicRoute = () => {
|
||||
const { isAuthenticated } = useAuth();
|
||||
|
||||
// Prevent logged-in users from seeing the login page again
|
||||
if (isAuthenticated) {
|
||||
return <Navigate to="/home" replace />;
|
||||
}
|
||||
|
||||
return <Outlet />;
|
||||
};
|
||||
@@ -0,0 +1,7 @@
|
||||
import { useDispatch, useSelector, useStore } from 'react-redux'
|
||||
import type { AppDispatch, AppStore, RootState } from './store'
|
||||
|
||||
// Use throughout your app instead of plain `useDispatch` and `useSelector`
|
||||
export const useAppDispatch = useDispatch.withTypes<AppDispatch>()
|
||||
export const useAppSelector = useSelector.withTypes<RootState>()
|
||||
export const useAppStore = useStore.withTypes<AppStore>()
|
||||
@@ -0,0 +1,3 @@
|
||||
|
||||
export * from './store';
|
||||
export * from './slice';
|
||||
@@ -0,0 +1,150 @@
|
||||
|
||||
import type { ConcessionType, StoreState, ValidationPointDto, ResultModel } from "../models";
|
||||
import { concessionTypeService, validationpointService } from "../services";
|
||||
|
||||
import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
|
||||
import type { PayloadAction } from '@reduxjs/toolkit';
|
||||
//import type { AppDispatch } from "./store";
|
||||
|
||||
// 1. Create the asynchronous thunk
|
||||
export const funThunkLoadConcessionType = createAsyncThunk<
|
||||
// Return type of the payload creator
|
||||
ResultModel<ConcessionType[]>,
|
||||
// First argument to the payload creator
|
||||
void,
|
||||
{
|
||||
// Optional fields for defining thunkApi field types
|
||||
// dispatch: AppDispatch
|
||||
|
||||
}>
|
||||
(
|
||||
'concessionType/fetchConcessionType',
|
||||
async (_, { rejectWithValue }) => {
|
||||
try {
|
||||
const response = await concessionTypeService.get();
|
||||
console.log("redux thunk load concession type", response);
|
||||
return response;
|
||||
} catch (err: any) {
|
||||
return rejectWithValue(err.response.data);
|
||||
}
|
||||
|
||||
}
|
||||
);
|
||||
export const funcThunkSaveConcessionType = createAsyncThunk(
|
||||
'product/fetchCatalog',
|
||||
async (data: ConcessionType, { rejectWithValue }) => {
|
||||
try {
|
||||
return await concessionTypeService.save(data);
|
||||
} catch (err: any) {
|
||||
return rejectWithValue('Failed save concessionType');
|
||||
}
|
||||
}
|
||||
);
|
||||
export const funThunkLoadValidationPoint = createAsyncThunk<
|
||||
// Return type of the payload creator
|
||||
ResultModel<ValidationPointDto[]>,
|
||||
// First argument to the payload creator
|
||||
void,
|
||||
{
|
||||
// Optional fields for defining thunkApi field types
|
||||
// dispatch: AppDispatch
|
||||
|
||||
}>
|
||||
(
|
||||
'validationPoint/loadValidationPoint',
|
||||
async (_, { rejectWithValue }) => {
|
||||
try {
|
||||
const response = await validationpointService.get();
|
||||
console.log("redux thunk load validationPoint ", response);
|
||||
return response;
|
||||
} catch (err: any) {
|
||||
return rejectWithValue(err.response.data);
|
||||
}
|
||||
|
||||
}
|
||||
);
|
||||
|
||||
// Define the initial state using that type
|
||||
const initialState: StoreState = {
|
||||
loading: false,
|
||||
concessionTypes: [],
|
||||
validationPoints: [],
|
||||
error: '',
|
||||
newId: -1
|
||||
};
|
||||
export const convalidationSlice = createSlice({
|
||||
name: 'convalidation',
|
||||
initialState,
|
||||
reducers: {
|
||||
addConcessionType: (state, action: PayloadAction<ConcessionType>) => {
|
||||
const ostate = [...state.concessionTypes, action.payload];
|
||||
state.concessionTypes = ostate;
|
||||
},
|
||||
// Delete item by filtering out the ID
|
||||
deleteConcessionById: (state, action: PayloadAction<number>) => {
|
||||
state.concessionTypes = state.concessionTypes.filter((item) => item.id !== action.payload);
|
||||
},
|
||||
},
|
||||
extraReducers: (builder) => {
|
||||
builder
|
||||
.addCase(funThunkLoadConcessionType.pending, (state) => {
|
||||
state.loading = true;
|
||||
state.error = null;
|
||||
})
|
||||
.addCase(funThunkLoadConcessionType.fulfilled, (state, action: PayloadAction<ResultModel<ConcessionType[]>>) => {
|
||||
state.loading = false;
|
||||
state.concessionTypes = action.payload.data;
|
||||
})
|
||||
.addCase(funThunkLoadConcessionType.rejected, (state, action: any) => {
|
||||
state.loading = false;
|
||||
if (action.payload)
|
||||
state.error = action.payload || 'Something went wrong';
|
||||
})
|
||||
.addCase(funThunkLoadValidationPoint.pending, (state) => {
|
||||
state.loading = true;
|
||||
state.error = null;
|
||||
})
|
||||
.addCase(funThunkLoadValidationPoint.fulfilled, (state, action: PayloadAction<ResultModel<ValidationPointDto[]>>) => {
|
||||
state.loading = false;
|
||||
state.validationPoints = action.payload.data;
|
||||
})
|
||||
.addCase(funThunkLoadValidationPoint.rejected, (state, action: any) => {
|
||||
state.loading = false;
|
||||
if (action.payload)
|
||||
state.error = action.payload || 'Something went wrong';
|
||||
})
|
||||
.addCase(funcThunkSaveConcessionType.pending, (state) => {
|
||||
state.loading = true;
|
||||
state.error = null;
|
||||
})
|
||||
.addCase(funcThunkSaveConcessionType.fulfilled, (state, action: PayloadAction<ResultModel<number>>) => {
|
||||
state.loading = false;
|
||||
state.newId = action.payload.data;
|
||||
})
|
||||
.addCase(funcThunkSaveConcessionType.rejected, (state, action: any) => {
|
||||
state.loading = false;
|
||||
if (action.payload)
|
||||
state.error = action.payload || 'Something went wrong';
|
||||
})
|
||||
},
|
||||
|
||||
});
|
||||
|
||||
export const { addConcessionType, deleteConcessionById } = convalidationSlice.actions;
|
||||
export default convalidationSlice.reducer;
|
||||
|
||||
|
||||
/*
|
||||
.addMatcher(
|
||||
(action) => action.type.endsWith('/pending') && action.type.startsWith('customer/'),
|
||||
(state) => { state.status = 'loading'; state.error = null; }
|
||||
)
|
||||
.addMatcher(
|
||||
(action) => action.type.endsWith('/rejected') && action.type.startsWith('customer/'),
|
||||
(state, action) => { state.status = 'failed'; state.error = action.payload as string; }
|
||||
)
|
||||
.addCase(fetchAllCustomers.fulfilled, (state, action) => {
|
||||
state.status = 'idle';
|
||||
state.list = action.payload;
|
||||
})
|
||||
*/
|
||||
@@ -0,0 +1,18 @@
|
||||
import { configureStore } from '@reduxjs/toolkit';
|
||||
import { useDispatch, useSelector, type TypedUseSelectorHook } from 'react-redux';
|
||||
import counterReducer from './slice';
|
||||
|
||||
export const store = configureStore({
|
||||
reducer: {
|
||||
concessionTypeRE: counterReducer,
|
||||
},
|
||||
});
|
||||
|
||||
// Infer the `RootState` and `AppDispatch` types from the store itself
|
||||
export type AppStore = typeof store;
|
||||
export type RootState = ReturnType<typeof store.getState>;
|
||||
export type AppDispatch = typeof store.dispatch;
|
||||
|
||||
// Use throughout your app instead of plain `useDispatch` and `useSelector`
|
||||
export const useAppDispatch = () => useDispatch<AppDispatch>();
|
||||
export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
|
||||
@@ -0,0 +1,144 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import {type ValidationPointDto } from '../models';
|
||||
import { validationpointService} from '../services';
|
||||
|
||||
|
||||
|
||||
|
||||
export default function ValidationPointApp() {
|
||||
|
||||
const empty: ValidationPointDto =
|
||||
{
|
||||
id: -1,
|
||||
description: '',
|
||||
display: '',
|
||||
active: false
|
||||
};
|
||||
const [list, setList] = useState<ValidationPointDto[]>([]);
|
||||
const [form, setForm] = useState(empty);
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
|
||||
// READ: Fetch all list
|
||||
useEffect(() => {
|
||||
fecthValidationPoint();
|
||||
}, []);
|
||||
const fecthValidationPoint = async () => {
|
||||
try{
|
||||
const vpres = await validationpointService.get();
|
||||
if (vpres.statusCode == 1)
|
||||
setList(vpres.data);
|
||||
}
|
||||
catch (error) {
|
||||
console.error('error loading Validation Point', error);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// INPUT HANDLER
|
||||
const handleInputChange = (e: { target: { name: any; value: any; }; }) => {
|
||||
const { name, value } = e.target;
|
||||
setForm({ ...form, [name]: value });
|
||||
setIsEditing(true);
|
||||
};
|
||||
// INPUT HANDLER
|
||||
const handleCheckChange = (e: { target: { name: any; checked:any }; }) => {
|
||||
const { name, checked } = e.target;
|
||||
|
||||
setForm({ ...form, [name]: checked });
|
||||
setIsEditing(true);
|
||||
};
|
||||
|
||||
// CREATE & UPDATE: Submit handler
|
||||
const handleSubmit = async (e: { preventDefault: () => void; }) => {
|
||||
console.log("on submit handle", isEditing,form);
|
||||
e.preventDefault();
|
||||
if (!form.description ) return alert('Please fill in all fields');
|
||||
|
||||
if (isEditing) {
|
||||
// SAVE (create/update)
|
||||
try {
|
||||
const old = form.id;
|
||||
const nid = await validationpointService.save(form);
|
||||
form.id = nid.data;
|
||||
if (old < 1)
|
||||
{
|
||||
const olist = list;
|
||||
olist.push(form);
|
||||
setList(olist);
|
||||
}
|
||||
else
|
||||
setList(list.map(c => c.id === form.id ? form : c));
|
||||
clearForm();
|
||||
} catch (error) {
|
||||
console.error('Error updating customer:', error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// DELETE
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
const respose = await validationpointService.delete(id);
|
||||
if (respose.data > 0)
|
||||
setList(list.filter(c => c.id !== id));
|
||||
else
|
||||
console.error('something is wrong', respose);
|
||||
} catch (error) {
|
||||
console.error('Error deleting customer:', error);
|
||||
}
|
||||
};
|
||||
|
||||
// UTILITIES
|
||||
const handleEditClick = (adminUser:ValidationPointDto) => {
|
||||
setForm(adminUser);
|
||||
setIsEditing(true);
|
||||
};
|
||||
|
||||
const clearForm = () => {
|
||||
setForm(empty);
|
||||
setIsEditing(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className='p-5'>
|
||||
<h2>Validation Point Management (CRUD)</h2>
|
||||
|
||||
{/* FORM COMPONENT */}
|
||||
<form onSubmit={handleSubmit} style={{ marginBottom: '20px', display: 'flex', gap: '10px' }}>
|
||||
<input
|
||||
type="text" name="description" placeholder="description"
|
||||
value={form.description} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="text" name="display" placeholder="display"
|
||||
value={form.display} onChange={handleInputChange}
|
||||
/>
|
||||
<input
|
||||
type="checkbox" name="active" placeholder="Active"
|
||||
checked={form.active} onChange={handleCheckChange}
|
||||
/>
|
||||
|
||||
|
||||
<button type="submit">{isEditing ? 'Update' : 'Add'}</button>
|
||||
{isEditing && <button type="button" onClick={clearForm}>Cancel</button>}
|
||||
</form>
|
||||
|
||||
{/* LIST COMPONENT */}
|
||||
<ul style={{ listStyle: 'none', padding: 0 }}>
|
||||
{list.map(item => (
|
||||
<li key={item.id} style={
|
||||
{ padding: '10px', borderBottom: '1px solid #ccc',
|
||||
display: 'flex', justifyContent: 'space-between' }}>
|
||||
<div>
|
||||
<strong>{item.description}</strong> ({item.display}) {item.active}
|
||||
</div>
|
||||
<div>
|
||||
<button onClick={() => handleEditClick(item)} style={{ marginRight: '5px' }}>Edit</button>
|
||||
<button onClick={() => handleDelete(item.id)}>Delete</button>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"target": "es2023",
|
||||
"lib": ["ES2023", "DOM"],
|
||||
"module": "esnext",
|
||||
"types": ["vite/client"],
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"verbatimModuleSyntax": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
|
||||
/* Linting */
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"erasableSyntaxOnly": false,
|
||||
"noFallthroughCasesInSwitch": true
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"files": [],
|
||||
"references": [
|
||||
{ "path": "./tsconfig.app.json" },
|
||||
{ "path": "./tsconfig.node.json" }
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||
"target": "es2023",
|
||||
"lib": ["ES2023"],
|
||||
"module": "esnext",
|
||||
"types": ["node"],
|
||||
"skipLibCheck": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"verbatimModuleSyntax": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
|
||||
/* Linting */
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"erasableSyntaxOnly": true,
|
||||
"noFallthroughCasesInSwitch": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react, { reactCompilerPreset } from '@vitejs/plugin-react'
|
||||
import babel from '@rolldown/plugin-babel'
|
||||
import tailwindcss from '@tailwindcss/vite'
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [
|
||||
react(),
|
||||
tailwindcss(),
|
||||
babel({ presets: [reactCompilerPreset()] })
|
||||
],
|
||||
server: {
|
||||
port:3000
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,17 @@
|
||||
# Editor configuration, see https://editorconfig.org
|
||||
root = true
|
||||
|
||||
[*]
|
||||
charset = utf-8
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
|
||||
[*.ts]
|
||||
quote_type = single
|
||||
ij_typescript_use_double_quotes = false
|
||||
|
||||
[*.md]
|
||||
max_line_length = off
|
||||
trim_trailing_whitespace = false
|
||||
Vendored
+2
@@ -0,0 +1,2 @@
|
||||
{
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
FROM node:20.18.0 AS build
|
||||
RUN mkdir -p /app
|
||||
WORKDIR /app
|
||||
|
||||
COPY ["./*.json", "./"]
|
||||
|
||||
RUN npm install -g @angular/cli
|
||||
|
||||
COPY . .
|
||||
# Run command in Virtual directory
|
||||
RUN npm cache clean --force
|
||||
|
||||
RUN npm install
|
||||
|
||||
#RUN ng build --configuration=production
|
||||
RUN ng build --configuration=production
|
||||
|
||||
FROM nginx:latest
|
||||
#### copy nginx conf
|
||||
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
#COPY --from=build app/dist/carParkvalidation/browser /usr/share/nginx/html
|
||||
#### copy artifact build from the 'build environment'
|
||||
COPY --from=build /app/dist/carparkvalidation/browser /usr/share/nginx/html
|
||||
|
||||
#CMD ["nginx", "-g", "daemon off;"]
|
||||
|
||||
EXPOSE 80
|
||||
|
||||
#docker build -t my_angular_app:latest .
|
||||
#docker run --name carval -d -p 4200:80 varlidate_ui
|
||||
#npm error code ENOENT
|
||||
@@ -0,0 +1,11 @@
|
||||
FROM node:20.18.0 AS build
|
||||
RUN npm install -g @angular/cli
|
||||
RUN mkdir -p /app
|
||||
WORKDIR /app
|
||||
COPY . .
|
||||
RUN npm install
|
||||
#CMD ["/bin/sh", "-c", "envsubst < /usr/share/nginx/html/assets/settings.template.json > /usr/share/nginx/html/assets/settings.json && exec nginx -g 'daemon off;'"]
|
||||
CMD [ "ng" ,"serve", "--host", "0.0.0.0" ]
|
||||
#image_name is app name like "carparkValidationui"
|
||||
#docker build -t carparkvalidation:latest .
|
||||
#docker run -d -p 4200:4200 --name carval carparkValidationui
|
||||
@@ -0,0 +1,27 @@
|
||||
# Myfirst
|
||||
|
||||
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.2.10.
|
||||
|
||||
## Development server
|
||||
|
||||
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
|
||||
|
||||
## Code scaffolding
|
||||
|
||||
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
|
||||
|
||||
## Build
|
||||
|
||||
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
|
||||
|
||||
## Running unit tests
|
||||
|
||||
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
|
||||
|
||||
## Running end-to-end tests
|
||||
|
||||
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
|
||||
|
||||
## Further help
|
||||
|
||||
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
|
||||
@@ -0,0 +1,101 @@
|
||||
{
|
||||
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||
"version": 1,
|
||||
"newProjectRoot": "projects",
|
||||
"projects": {
|
||||
"CarParkValidation": {
|
||||
"projectType": "application",
|
||||
"schematics": {},
|
||||
"root": "",
|
||||
"sourceRoot": "src",
|
||||
"prefix": "app",
|
||||
"architect": {
|
||||
"build": {
|
||||
"builder": "@angular-devkit/build-angular:application",
|
||||
"options": {
|
||||
"outputPath": "dist/carparkvalidation",
|
||||
"index": "src/index.html",
|
||||
"browser": "src/main.ts",
|
||||
"polyfills": [
|
||||
"zone.js"
|
||||
],
|
||||
"tsConfig": "tsconfig.app.json",
|
||||
"assets": [
|
||||
{
|
||||
"glob": "**/*",
|
||||
"input": "public"
|
||||
}
|
||||
],
|
||||
"styles": [
|
||||
"src/styles.css",
|
||||
"node_modules/primeng/resources/primeng.css"
|
||||
],
|
||||
"scripts": []
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"budgets": [
|
||||
{
|
||||
"type": "initial",
|
||||
"maximumWarning": "5MB",
|
||||
"maximumError": "4MB"
|
||||
},
|
||||
{
|
||||
"type": "anyComponentStyle",
|
||||
"maximumWarning": "2kB",
|
||||
"maximumError": "4kB"
|
||||
}
|
||||
],
|
||||
"outputHashing": "all"
|
||||
},
|
||||
"development": {
|
||||
"optimization": false,
|
||||
"extractLicenses": false,
|
||||
"sourceMap": true
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "production"
|
||||
},
|
||||
"serve": {
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
"configurations": {
|
||||
"production": {
|
||||
"buildTarget": "CarParkValidation:build:production"
|
||||
},
|
||||
"development": {
|
||||
"buildTarget": "CarParkValidation:build:development"
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "development"
|
||||
},
|
||||
"extract-i18n": {
|
||||
"builder": "@angular-devkit/build-angular:extract-i18n"
|
||||
},
|
||||
"test": {
|
||||
"builder": "@angular-devkit/build-angular:karma",
|
||||
"options": {
|
||||
"polyfills": [
|
||||
"zone.js",
|
||||
"zone.js/testing"
|
||||
],
|
||||
"tsConfig": "tsconfig.spec.json",
|
||||
"assets": [
|
||||
{
|
||||
"glob": "**/*",
|
||||
"input": "public"
|
||||
|
||||
}
|
||||
],
|
||||
"styles": [
|
||||
"src/styles.css"
|
||||
],
|
||||
"scripts": []
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"cli": {
|
||||
"analytics": false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
server {
|
||||
listen 80;
|
||||
sendfile on;
|
||||
default_type application/octet-stream;
|
||||
|
||||
gzip on;
|
||||
gzip_http_version 1.1;
|
||||
gzip_disable "MSIE [1-6]\.";
|
||||
gzip_min_length 256;
|
||||
gzip_vary on;
|
||||
gzip_proxied expired no-cache no-store private auth;
|
||||
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
gzip_comp_level 9;
|
||||
|
||||
root /usr/share/nginx/html;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html =404;
|
||||
}
|
||||
}
|
||||
Generated
+13896
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,47 @@
|
||||
{
|
||||
"name": "CarParkValidation",
|
||||
"version": "1.0.0",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve",
|
||||
"build": "ng build",
|
||||
"watch": "ng build --watch --configuration development",
|
||||
"test": "ng test"
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^18.2.0",
|
||||
"@angular/common": "^18.2.0",
|
||||
"@angular/compiler": "^18.2.0",
|
||||
"@angular/core": "^18.2.0",
|
||||
"@angular/forms": "^18.2.0",
|
||||
"@angular/material": "^18.2.10",
|
||||
"@angular/material-moment-adapter": "^18.2.10",
|
||||
"@angular/platform-browser": "^18.2.0",
|
||||
"@angular/platform-browser-dynamic": "^18.2.0",
|
||||
"@angular/router": "^18.2.0",
|
||||
"moment": "^2.30.1",
|
||||
"primeflex": "^3.3.1",
|
||||
"primeicons": "^7.0.0",
|
||||
"primeng": "^17.18.11",
|
||||
"rxjs": "~7.8.0",
|
||||
"tslib": "^2.3.0",
|
||||
"zone.js": "~0.14.10"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "^18.2.10",
|
||||
"@angular/cli": "^18.2.10",
|
||||
"@angular/compiler-cli": "^18.2.0",
|
||||
"@types/jasmine": "~5.1.0",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"jasmine-core": "~5.2.0",
|
||||
"karma": "~6.4.0",
|
||||
"karma-chrome-launcher": "~3.2.0",
|
||||
"karma-coverage": "~2.2.0",
|
||||
"karma-jasmine": "~5.1.0",
|
||||
"karma-jasmine-html-reporter": "~2.1.0",
|
||||
"postcss": "^8.4.49",
|
||||
"tailwindcss": "^3.4.15",
|
||||
"typescript": "~5.5.2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"baseUrl": "http://localhost:8080",
|
||||
"baseUrl_local": "http://nephmdb-sql007/CarParkValidationAPI",
|
||||
"loginUrl": "api/login",
|
||||
"updatePersonUrl": "api/updatePerson",
|
||||
"getAllUrl": "api/v1/Users/GetAllUsers",
|
||||
"authenticateUrl": "api/v1/Users/Authenticate",
|
||||
"validationPoint":"api/v1/ValidationPoint"
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 46 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 74 KiB |
@@ -0,0 +1,12 @@
|
||||
table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mat-form-field {
|
||||
font-size: 14px;
|
||||
width: 100%;
|
||||
}
|
||||
td.mat-column-edit, .mat-column-delete {
|
||||
width: 35px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
<div class="edit-content">
|
||||
<h3>Application Administrators</h3>
|
||||
<div class="addlink">
|
||||
<a [routerLink]='["/home/adminuser", 0]' [queryParams]="{returnUrl:'/home/adminuser'}">
|
||||
<i class="material-icons">playlist_add</i>
|
||||
Add User
|
||||
</a>
|
||||
</div>
|
||||
<table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z8" >
|
||||
|
||||
<!-- Desciption Column -->
|
||||
<ng-container matColumnDef="stafflinkNo">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Stafflink Id</th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.stafflinkNo}} </td>
|
||||
</ng-container>
|
||||
|
||||
<!-- name Column -->
|
||||
<ng-container matColumnDef="name">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Name</th>
|
||||
<td mat-cell *matCellDef="let element">{{element.name}} </td>
|
||||
</ng-container>
|
||||
|
||||
<!-- roleType Column -->
|
||||
<ng-container matColumnDef="roleType">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Role</th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.roleType}}
|
||||
|
||||
</td>
|
||||
</ng-container>
|
||||
<!-- ValidationPoint Column -->
|
||||
<ng-container matColumnDef="validationPoint">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Validation Point</th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.validationPoint}}
|
||||
</td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="edit" stickyEnd>
|
||||
<th mat-header-cell *matHeaderCellDef>Edit</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<a [routerLink]='["/home/adminuser", element.id]' [queryParams]="{returnUrl:'/home/adminuser'}">
|
||||
<mat-icon>edit</mat-icon>
|
||||
</a>
|
||||
</td>
|
||||
</ng-container>
|
||||
<!-- active Column -->
|
||||
<ng-container matColumnDef="active">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Active</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<mat-checkbox [checked] ="element.active" name="active" color="primary" >
|
||||
</mat-checkbox>
|
||||
</td>
|
||||
</ng-container>
|
||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;" class="selection-pointer tr-mouseover" (click)="showEdit(row)"></tr>
|
||||
</table>
|
||||
<mat-paginator [pageSize]="10" [pageSizeOptions]="[10, 20]" showFirstLastButtons></mat-paginator>
|
||||
</div>
|
||||
@@ -0,0 +1,100 @@
|
||||
import { Component, Inject, OnInit, ViewChild, AfterViewInit} from '@angular/core';
|
||||
|
||||
import { AdminUserView } from '../models';
|
||||
import { MatPaginator } from '@angular/material/paginator';
|
||||
import { MatSort } from '@angular/material/sort';
|
||||
import { MatTableDataSource } from '@angular/material/table';
|
||||
|
||||
/* ngRx */
|
||||
/*
|
||||
import { Store, select } from '@ngrx/store';
|
||||
import * as validationActions from './store/actions/validationpoint.action';
|
||||
import * as validationSelector from './store/selectors/validationpoint.selector';
|
||||
import { appValidationState } from './store/reducers';
|
||||
*/
|
||||
import { take } from 'rxjs/operators';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { Router } from '@angular/router';
|
||||
import { AdminUserService } from './adminuser.service';
|
||||
@Component({
|
||||
selector: 'adminuser-list',
|
||||
templateUrl: './adminuser.component.html',
|
||||
styleUrls: ['./adminuser.component.css']
|
||||
})
|
||||
export class AdminUserComponent implements OnInit, AfterViewInit{
|
||||
dataSource: MatTableDataSource<AdminUserView>;
|
||||
private subscription:Subscription = new Subscription();
|
||||
displayedColumns: string[] = [ 'stafflinkNo', 'name', 'roleType', 'validationPoint', 'active','edit'];
|
||||
msg ="[AdminUser component]";
|
||||
@ViewChild(MatSort) sort!: MatSort;
|
||||
@ViewChild(MatPaginator) paginator!: MatPaginator;
|
||||
|
||||
|
||||
/*
|
||||
private store: Store<appValidationState>
|
||||
*/
|
||||
constructor(
|
||||
private adminUserService: AdminUserService,
|
||||
private router: Router,
|
||||
|
||||
) {
|
||||
|
||||
this.dataSource = new MatTableDataSource<AdminUserView>();
|
||||
}
|
||||
/*
|
||||
applyFilter($event:any) {
|
||||
const filterValue = $event.target.value;
|
||||
this.dataSource.filter = filterValue.trim().toLowerCase();
|
||||
}
|
||||
*/
|
||||
ngOnInit(): void
|
||||
{
|
||||
this.subscription.add(
|
||||
this.adminUserService.loadAdminusers().subscribe(result => {
|
||||
console.log(this.msg + "onInit load Data", result);
|
||||
this.dataSource.data = result.data;
|
||||
}, error => {
|
||||
const message = error || error.message;
|
||||
//this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
} )
|
||||
|
||||
);
|
||||
|
||||
/*
|
||||
this.store.dispatch(validationActions.LoadValidationpoints());
|
||||
this.store.pipe(select(validationSelector.getAllValidations)).subscribe(result => this.dataSource.data = result);
|
||||
*/
|
||||
}
|
||||
ngAfterViewInit(): void {
|
||||
this.dataSource.sort = this.sort;
|
||||
this.dataSource.paginator = this.paginator;
|
||||
}
|
||||
|
||||
showEdit(item: AdminUserView)
|
||||
{
|
||||
console.log(this.msg + "on row click", item);
|
||||
this.router.navigate(['/home/adminuser/'+item.id], { queryParams: {returnUrl:'/home/adminuser' } });
|
||||
}
|
||||
deleteItem(id: number): void {
|
||||
|
||||
this.adminUserService.deleteAdminuser(id)
|
||||
.pipe(take(1))
|
||||
.subscribe(result => {
|
||||
console.log(this.msg + " deleteItem success", result);
|
||||
let data = this.dataSource.data;
|
||||
let index: number = data.findIndex(d => d.id === id);
|
||||
console.log(this.msg + "delete from datasource");
|
||||
data.splice(index, 1)
|
||||
this.dataSource.data = data;
|
||||
},
|
||||
error => console.error(error));
|
||||
console.log(this.msg + "click button to delete");
|
||||
}
|
||||
ngOnDestroy() {
|
||||
this.subscription.unsubscribe();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mat-form-field {
|
||||
font-size: 14px;
|
||||
width: 100%;
|
||||
}
|
||||
td.mat-column-edit, .mat-column-delete {
|
||||
width: 35px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
<div class="edit-content">
|
||||
<div class="title">
|
||||
{{getEditText()}}
|
||||
</div>
|
||||
<form [formGroup]="adminuserForm" (ngSubmit)="onSubmit()" fxLayout="column" fxLayoutGap="10px" >
|
||||
<div class="flex flex-column">
|
||||
<div>
|
||||
<mat-form-field appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Stafflink Number<strong class="app-require">*</strong></mat-label>
|
||||
<input matInput formControlName="stafflinkNo" (blur)="searchUser()" maxlength="10"
|
||||
name="stafflinkno" placeholder="Stafflink Number" required #mystaffid>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-checkbox formControlName="active" color="primary">Active</mat-checkbox>
|
||||
</div>
|
||||
<div class="flex flex-row">
|
||||
<div class="ml-2">
|
||||
<mat-form-field appearance="outline">
|
||||
<mat-label>Name</mat-label>
|
||||
<input matInput formControlName="name" maxlength="100" name="name" placeholder="Name" readonly>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
|
||||
<div class="ml-2">
|
||||
<mat-form-field appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Role<strong class="app-require">*</strong></mat-label>
|
||||
<mat-select formControlName="roleType" required>
|
||||
<mat-option>--</mat-option>
|
||||
<mat-option *ngFor="let role of Roles" [value]="role.id">
|
||||
{{role.description}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="f['roleType'].hasError('required')">Please choose Role</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex flex-row">
|
||||
<div class="ml-2">
|
||||
<mat-form-field appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Validation Point<strong class="app-require">*</strong></mat-label>
|
||||
<mat-select formControlName="validationPointId" required >
|
||||
<mat-option>--</mat-option>
|
||||
<mat-option *ngFor="let validationPoint of validationPoints" [value]="validationPoint.id">
|
||||
{{validationPoint.description}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="f['validationPointId'].hasError('required')">Please choose validation Point</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex flex-row gap-2 justify-content-end">
|
||||
<button type="submit" mat-raised-button color="primary" [disabled]="isFieldsChange">Submit</button>
|
||||
<button type="button" mat-raised-button color="primary" (click)="goBack()">Cancel</button>
|
||||
</div>
|
||||
</form>
|
||||
<!--pre>{{ adminuserForm.value|json}}</pre-->
|
||||
</div>
|
||||
@@ -0,0 +1,181 @@
|
||||
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
|
||||
import { Router, ActivatedRoute } from '@angular/router';
|
||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||
import { Subject, pipe ,Subscription} from 'rxjs';
|
||||
|
||||
import {AdminUser, Lookup, userRole} from '../models';
|
||||
import { LookupService, Utils } from '../shares';
|
||||
import { AdminUserService } from './adminuser.service';
|
||||
|
||||
@Component({
|
||||
templateUrl: 'adminuser.edit.component.html',
|
||||
selector: 'adminuser-edit',
|
||||
styleUrls: ['adminuser.edit.component.css']
|
||||
})
|
||||
export class AdminUserEditComponent implements OnInit, OnDestroy {
|
||||
returnUrl ='';
|
||||
loginUser ='';
|
||||
_id= -1;
|
||||
Roles?: Lookup[];
|
||||
validationPoints?: Lookup[];
|
||||
msg="[adminUser Component] ";
|
||||
//for focus input
|
||||
// @ViewChild('mystaffid') mystaffNo!: MatInput;
|
||||
isChange = true; // disable use false//true for not disable. make sure it true is disable button.
|
||||
private subscription:Subscription = new Subscription();
|
||||
subChanged$ = new Subject<boolean>();
|
||||
adminuserForm: FormGroup;
|
||||
|
||||
constructor(private formBuilder: FormBuilder,
|
||||
private adminUserService: AdminUserService,
|
||||
|
||||
private lookupService: LookupService,
|
||||
private router: Router, private route: ActivatedRoute,
|
||||
) {
|
||||
this.adminuserForm = this.formBuilder.group({
|
||||
id: [0], //Validators.required
|
||||
stafflinkNo: [''], //Validators.required
|
||||
name: [''], //Validators.required
|
||||
addedBy: [''], //Validators.required
|
||||
addedOn: [], //Validators.required
|
||||
active: [false], //Validators.required
|
||||
roleType: [0,Validators.required],
|
||||
validationPointId: [0, Validators.required]
|
||||
});
|
||||
this.Roles = [];
|
||||
let item:Lookup = {id:userRole.Admin,categoryId:userRole.Admin, description:'Admin'};
|
||||
this.Roles.push(item);
|
||||
item = {id:userRole.Normal,categoryId:userRole.Normal, description:'Normal'};
|
||||
this.Roles.push(item);
|
||||
this.subscription.add(this.lookupService.loadValidationPoint().subscribe(x => this.validationPoints = x.data,
|
||||
error => console.error(error)) );
|
||||
}
|
||||
ngOnInit():void {
|
||||
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
|
||||
const id = Number(this.route.snapshot.paramMap.get('id'));
|
||||
// now load thing up
|
||||
const user = Utils.getCurrentUser();
|
||||
// console.log(this.msg + "current login user ", user);
|
||||
if (user.username === '')
|
||||
alert("you are not login.");
|
||||
else
|
||||
this.loginUser = user.firstName;
|
||||
this._id = id;
|
||||
//console.log(this.msg + " " + id );
|
||||
this.subscription.add(this.adminuserForm.valueChanges.subscribe(x => this.isChange = false));
|
||||
this.subscription.add(this.subChanged$.subscribe(x => this.isChange = x));
|
||||
if (id > 0)
|
||||
{
|
||||
this.subscription.add(this.adminUserService.loadAdminuserById(id).subscribe({
|
||||
next: x => this.assignValue(x.data),
|
||||
error: x =>console.error(x)
|
||||
}
|
||||
));
|
||||
//this.toastr.error(error.message)) );
|
||||
}
|
||||
|
||||
}
|
||||
getEditText(): string {
|
||||
if (this._id > 0)
|
||||
return "Edit Admin User";
|
||||
else
|
||||
return "New Admin User";
|
||||
}
|
||||
// this for disable submit button
|
||||
get isFieldsChange() {
|
||||
const chan = this.isChange || !this.adminuserForm.valid; // this disable so need true valid = true not
|
||||
//console.log(this.msg + 'is fields change', chan);
|
||||
return chan;
|
||||
}
|
||||
searchUser(): void {
|
||||
const staffid = this.adminuserForm.controls["stafflinkNo"].value;
|
||||
// console.log(this.msg + " the staffid is ", staffid);
|
||||
if (staffid != '') {
|
||||
//this.form.controls['your form control name'].value
|
||||
this.adminUserService.getStaffLinkId(staffid).subscribe(x => {
|
||||
//console.log(this.msg + " this is stafflink no ", x);
|
||||
// now get current user.
|
||||
|
||||
if (x.data) {
|
||||
//this.error = true;
|
||||
const fname = x.data.firstName + " " + x.data.lastName;
|
||||
this.adminuserForm.patchValue({name:fname, addedBy:this.loginUser});
|
||||
|
||||
}
|
||||
else {
|
||||
// this.toastr.error("can not find stafflinkNo:" + staffid);
|
||||
// this.adminuserForm.patchValue({name:x.data.firstName + " " + x.data.lastName
|
||||
}
|
||||
},
|
||||
error => {
|
||||
const message = error || error.message;
|
||||
// this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
}
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
//this.toastr.error("please enter staff link no");
|
||||
}
|
||||
}
|
||||
assignValue(adminuser:AdminUser): void {
|
||||
this.adminuserForm.patchValue({
|
||||
id: adminuser.id,
|
||||
stafflinkNo: adminuser.stafflinkNo,
|
||||
name: adminuser.name,
|
||||
addedBy: adminuser.addedBy,
|
||||
addedOn: adminuser.addedOn,
|
||||
active: adminuser.active,
|
||||
roleType: adminuser.roleType,
|
||||
validationPointId: adminuser.validationPointId
|
||||
});
|
||||
// disable use false//true for not disable.
|
||||
this.subChanged$.next(true);
|
||||
}
|
||||
|
||||
// convenience getter for easy access in form fields
|
||||
get f() { return this.adminuserForm.controls;}
|
||||
|
||||
onSubmit(): void {
|
||||
// if form valid then go save
|
||||
//make sure
|
||||
const okToSave = this.adminuserForm.valid;
|
||||
if (okToSave)
|
||||
{
|
||||
let adminuserValue = this.adminuserForm.value;
|
||||
|
||||
let adminuser:AdminUser = {
|
||||
id: adminuserValue.id,
|
||||
stafflinkNo: adminuserValue.stafflinkNo,
|
||||
name: adminuserValue.name,
|
||||
addedBy: adminuserValue.addedBy,
|
||||
addedOn: new Date(),
|
||||
active: adminuserValue.active,
|
||||
roleType: adminuserValue.roleType,
|
||||
validationPointId: adminuserValue.validationPointId,
|
||||
};
|
||||
this.subscription.add (
|
||||
this.adminUserService.saveAdminuser(adminuser).subscribe(x => {
|
||||
if (x.statusCode >= 1)
|
||||
{
|
||||
//this.toastr.success("save is ok");
|
||||
this.router.navigate([this.returnUrl]);
|
||||
}
|
||||
},
|
||||
error => {
|
||||
const message = error || error.message;
|
||||
//this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
}
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
goBack(): void {
|
||||
this.router.navigate([this.returnUrl]);
|
||||
}
|
||||
ngOnDestroy() {
|
||||
this.subscription.unsubscribe();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
|
||||
import { Injectable, Inject } from '@angular/core';
|
||||
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
|
||||
import { Observable } from 'rxjs';
|
||||
import { AdminUser, AdminUserView, ResultModel,ConfigureUrl,User } from '../models';
|
||||
import { AppSettingService } from '../shares';
|
||||
|
||||
@Injectable({ providedIn: 'root' })
|
||||
export class AdminUserService {
|
||||
|
||||
constructor(private http: HttpClient,
|
||||
private appSetting :AppSettingService
|
||||
) {}
|
||||
loadAdminusers(): Observable<ResultModel<AdminUserView[]>> {
|
||||
let config = { headers : { 'Content-Type': 'application/json' } };
|
||||
//const baseUrl = ConfigureUrl.baseUrl + "/"+ ConfigureUrl.adminUserUrl;
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl + "/"+ ConfigureUrl.adminUserUrl;
|
||||
return this.http.get<ResultModel<AdminUserView[]>>(baseUrl);
|
||||
}
|
||||
getStaffLinkId(staffid:string) :Observable<ResultModel<User>>{
|
||||
const userUrl = this.appSetting.appSetting.baseUrl + "/" + ConfigureUrl.userByStaffIdUrl;
|
||||
let params = new HttpParams().set("stafflinkNo", ""+staffid);
|
||||
let headers = new HttpHeaders().set('Content-Type', 'application/json');
|
||||
let options = {
|
||||
headers: headers,
|
||||
params: params
|
||||
};
|
||||
return this.http.get<ResultModel<User>>(userUrl, options);
|
||||
}
|
||||
loadAdminuserById(id:number): Observable<ResultModel<AdminUser>> {
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl + "/"+ ConfigureUrl.adminUserUrl;
|
||||
let params = new HttpParams().set("id", ""+id);
|
||||
let headers = new HttpHeaders().set('Content-Type', 'application/json');
|
||||
let options = {
|
||||
headers: headers,
|
||||
params: params
|
||||
};
|
||||
//return this.http.get<AdminUser>(this.baseUrl + 'api/Adminuser/LoadAdminuserById',options);
|
||||
return this.http.get<ResultModel<AdminUser>>(baseUrl + "/" + id);
|
||||
}
|
||||
saveAdminuser(jsData:AdminUser): Observable<ResultModel<number>> { //insert Adminuser
|
||||
let config = { headers : { 'Content-Type': 'application/json' } };
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl + "/"+ ConfigureUrl.adminUserUrl;
|
||||
return this.http.post<ResultModel<number>>(baseUrl, jsData, config);
|
||||
}
|
||||
deleteAdminuser(id:number): Observable<ResultModel<number>>{
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl + "/"+ ConfigureUrl.adminUserUrl;
|
||||
let config = { headers : { 'Content-Type': 'application/json' } };
|
||||
return this.http.delete<ResultModel<number>>(baseUrl + "/" + id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
export * from './adminuser.component';
|
||||
export * from './adminuser.edit.component';
|
||||
export * from './adminuser.service';
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { AdminUserComponent, AdminUserEditComponent } from './adminuser';
|
||||
import { ConcessionTypeComponent, ConcessiontypeEditComponent} from './concessiontype';
|
||||
import { ConcessionValidationComponent, ConcessionValidationEditComponent } from './concessionValidation';
|
||||
import { HomeComponent } from './home';
|
||||
import { LoginComponent } from './login';
|
||||
import { ValidationPointComponent, ValidationpointEditComponent } from './validationPoint';
|
||||
import { AuthGuard } from './route-guard';
|
||||
import {ConcessionvalidationReportComponent} from './concessionvalidationreport';
|
||||
const routes: Routes = [
|
||||
|
||||
{ path: 'login', component: LoginComponent },
|
||||
{ path: 'home', component: HomeComponent ,
|
||||
children: [
|
||||
{ path: 'adminuser', component: AdminUserComponent, canActivate: [AuthGuard], data: { roleAllowed: 'Admin' }} ,
|
||||
{ path: 'adminuser/:id', component: AdminUserEditComponent, canActivate: [AuthGuard], data: { roleAllowed: 'Admin' }},
|
||||
{ path: 'validationpoint', component: ValidationPointComponent, canActivate: [AuthGuard], data: { roleAllowed: 'Admin' } },
|
||||
{ path: 'validationpoint/:id', component: ValidationpointEditComponent,canActivate: [AuthGuard], data: { roleAllowed: 'Admin' } },
|
||||
{ path: 'concessiontype', component:ConcessionTypeComponent, canActivate: [AuthGuard], data: { roleAllowed: 'Admin' }},
|
||||
{ path: 'concessiontype/:id', component: ConcessiontypeEditComponent, canActivate: [AuthGuard], data: { roleAllowed: 'Admin' }},
|
||||
{ path: 'concessionvalidation', component: ConcessionValidationComponent, canActivate: [AuthGuard]},
|
||||
{ path: 'concessionvalidation/:id', component: ConcessionValidationEditComponent, canActivate: [AuthGuard]},
|
||||
|
||||
{ path: 'app-concessionvalidation-report', component: ConcessionvalidationReportComponent, canActivate: [AuthGuard], data: { roleAllowed: 'Admin' }},
|
||||
]
|
||||
},
|
||||
// otherwise redirect to home
|
||||
{ path: '', redirectTo: 'login', pathMatch: 'full' },
|
||||
{ path: '**', redirectTo: 'login' },
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forRoot(routes)],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
export class AppRoutingModule { }
|
||||
@@ -0,0 +1,24 @@
|
||||
.container {
|
||||
display:flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height:100%;
|
||||
}
|
||||
|
||||
.mat-sidenav-container,.mat-sidenav-content {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.mat-sidenav{
|
||||
width:250px;
|
||||
}
|
||||
|
||||
.main-content {
|
||||
padding-left:25px;
|
||||
padding-right:15px;
|
||||
justify-content:space-around;
|
||||
}
|
||||
|
||||
.mat-toolbar {
|
||||
justify-content: start;
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
|
||||
<router-outlet></router-outlet>
|
||||
@@ -0,0 +1,35 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { RouterTestingModule } from '@angular/router/testing';
|
||||
import { AppComponent } from './app.component';
|
||||
|
||||
describe('AppComponent', () => {
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [
|
||||
RouterTestingModule
|
||||
],
|
||||
declarations: [
|
||||
AppComponent
|
||||
],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
it('should create the app', () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app).toBeTruthy();
|
||||
});
|
||||
|
||||
it(`should have as title 'CarParkValidation'`, () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app.title).toEqual('CarParkValidation');
|
||||
});
|
||||
|
||||
it('should render title', () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
fixture.detectChanges();
|
||||
const compiled = fixture.nativeElement;
|
||||
expect(compiled.querySelector('.content span').textContent).toContain('CarParkValidation app is running!');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,10 @@
|
||||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.css']
|
||||
})
|
||||
export class AppComponent {
|
||||
title = 'CarParkValidation';
|
||||
}
|
||||
@@ -0,0 +1,139 @@
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { NgModule ,CUSTOM_ELEMENTS_SCHEMA,APP_INITIALIZER} from '@angular/core';
|
||||
import { FormsModule,ReactiveFormsModule } from '@angular/forms';
|
||||
import { HttpClientModule, HTTP_INTERCEPTORS} from '@angular/common/http';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
|
||||
import { AppMaterialModule } from './material/app.material.module';
|
||||
import { MAT_DATE_LOCALE } from '@angular/material/core';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
import { HomeComponent } from './home';
|
||||
import { LoginComponent } from './login';
|
||||
import { NavMenuComponent } from './nav-menu/nav-menu.component';
|
||||
import { NavToolarComponent } from './nav-toolbar/nav-toolbar.component';
|
||||
import {AuthenticationService} from './user-services/authentication.service';
|
||||
import { AppRoutingModule } from './app-routing.module';
|
||||
import { AppComponent } from './app.component';
|
||||
//here the custom components
|
||||
import {SetupModuleModule} from './setup-module/setup-module.module';
|
||||
import { ConcessionvalidationReportComponent } from './concessionvalidationreport';
|
||||
|
||||
import {AppSettingService, ErrorInterceptor, JwtInterceptor } from './shares';
|
||||
import {ConcessionValidationService, ConcessionValidationEditComponent, ConcessionValidationComponent} from './concessionValidation';
|
||||
|
||||
|
||||
//and in the module providers
|
||||
// { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_MOMENT_FORMATS }
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
AppComponent,
|
||||
NavMenuComponent,
|
||||
HomeComponent,
|
||||
LoginComponent,
|
||||
NavToolarComponent,
|
||||
ConcessionValidationEditComponent,
|
||||
ConcessionValidationComponent,
|
||||
ConcessionvalidationReportComponent,
|
||||
|
||||
],
|
||||
imports: [
|
||||
BrowserModule,
|
||||
AppRoutingModule,
|
||||
ReactiveFormsModule,
|
||||
FormsModule,
|
||||
HttpClientModule,
|
||||
AppMaterialModule,
|
||||
SetupModuleModule,
|
||||
AppRoutingModule,
|
||||
BrowserAnimationsModule,
|
||||
|
||||
],
|
||||
providers: [
|
||||
{
|
||||
provide : APP_INITIALIZER,
|
||||
multi : true,
|
||||
deps : [AppSettingService],
|
||||
useFactory : (appConfigService : AppSettingService) => () => appConfigService.loadAppSetting()
|
||||
},
|
||||
{ provide: MAT_DATE_LOCALE, useValue: 'en-GB',multi: true },
|
||||
|
||||
|
||||
{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
|
||||
{ provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
|
||||
],
|
||||
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
export class AppModule { }
|
||||
|
||||
/*
|
||||
|
||||
|
||||
make star * small
|
||||
check start expiry make the
|
||||
the banner is red.
|
||||
#e02c2c
|
||||
*/
|
||||
/*
|
||||
ng build --base-href "/CarParkValidation/"
|
||||
ng build --base-href "/CarParkValidation/" --prod
|
||||
*/
|
||||
/*
|
||||
downgrade angular
|
||||
ng --version
|
||||
npm uninstall -g @angular/cli
|
||||
npm cache clean --force
|
||||
npm install moment
|
||||
npm i @angular/material-moment-adapter@10
|
||||
// for angular datetime picker
|
||||
*/
|
||||
/*
|
||||
tailwind css
|
||||
and daisy UI
|
||||
|
||||
npm install -d tailwindcss
|
||||
npx tailwindcss init
|
||||
now install daisyUI
|
||||
npm i -D daisyui@latest
|
||||
|
||||
tailwind.config.js
|
||||
/* @type {import('tailwindcss').Config} */
|
||||
//module.exports = {
|
||||
// >>>>>>>>> content: ["./src/**/*.{html,ts}"], <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
||||
// theme: {
|
||||
// extend: {},
|
||||
// },
|
||||
// >>>>>>>>>>>>>>>>>>plugins: [require('daisyui'),], <<<<<<<<<<<<<<<<<<<<<<<
|
||||
//}
|
||||
/*
|
||||
style.css
|
||||
@import "primeng/resources/themes/lara-light-blue/theme.css";
|
||||
@import "primeng/resources/primeng.css";
|
||||
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
// this is override for primeng
|
||||
@layer tailwind-base, primeng, tailwind-utilities;
|
||||
@layer tailwind-base {
|
||||
@tailwind base;
|
||||
}
|
||||
@layer primeng;
|
||||
@layer tailwind-utilities {
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
}
|
||||
|
||||
files.associations
|
||||
"files.associations": {
|
||||
"*.css": "tailwindcss"
|
||||
}
|
||||
*/
|
||||
@@ -0,0 +1,12 @@
|
||||
table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mat-form-field {
|
||||
font-size: 14px;
|
||||
width: 100%;
|
||||
}
|
||||
td.mat-column-edit, .mat-column-delete {
|
||||
width: 35px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
<div class="edit-content">
|
||||
<h3>Concession Validation</h3>
|
||||
<div *ngIf="isAdmin">
|
||||
<mat-form-field>
|
||||
<mat-label>Choose a from date</mat-label>
|
||||
<input matInput [(ngModel)]="fromDate" (focus)="pickerfrom.open()" [matDatepicker]="pickerfrom">
|
||||
<mat-datepicker-toggle matSuffix [for]="pickerfrom"></mat-datepicker-toggle>
|
||||
<mat-datepicker #pickerfrom></mat-datepicker>
|
||||
</mat-form-field>
|
||||
<mat-form-field >
|
||||
<mat-label>Choose a to date</mat-label>
|
||||
<input matInput [(ngModel)]="toDate" (focus)="pickerto.open()" [matDatepicker]="pickerto">
|
||||
<mat-datepicker-toggle matSuffix [for]="pickerto"></mat-datepicker-toggle>
|
||||
<mat-datepicker #pickerto></mat-datepicker>
|
||||
</mat-form-field>
|
||||
<button mat-mini-fab color="primary" aria-label="loading record" (click)="onLoad()" matTooltip="Loading">
|
||||
<mat-icon>bolt</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
<div class="addlink">
|
||||
<a [routerLink]='["/home/concessionvalidation", 0]' [queryParams]="{returnUrl:'/home/concessionvalidation'}" (click)="setDate()">
|
||||
<i class="material-icons">add_task</i>
|
||||
Add Concession Validation
|
||||
</a>
|
||||
</div>
|
||||
<table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z8">
|
||||
<!-- validateDate Column -->
|
||||
<ng-container matColumnDef="validateDate">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Date </th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.validateDate | date: 'dd/MM/yyyy HH:mm'}} </td>
|
||||
</ng-container>
|
||||
<!-- concessionType Column -->
|
||||
<ng-container matColumnDef="concessionType">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Concession Type </th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.concessionType}} </td>
|
||||
</ng-container>
|
||||
<!-- concessionCard Column -->
|
||||
<ng-container matColumnDef="concessionCard">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Concession Card</th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.concessionCard}} </td>
|
||||
</ng-container>
|
||||
<!-- concessionHolder Column -->
|
||||
<ng-container matColumnDef="concessionHolder">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Concession Holder</th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.concessionHolder}} </td>
|
||||
</ng-container>
|
||||
<!-- validationPoint Column -->
|
||||
<ng-container matColumnDef="validationPoint">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Validation Point </th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.validationPoint}} </td>
|
||||
</ng-container>
|
||||
<!-- concessionExpiry Column -->
|
||||
<ng-container matColumnDef="concessionExpiry">
|
||||
<th mat-header-cell *matHeaderCellDef>Expiry date checked</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<mat-checkbox [checked] ="element.concessionExpiry" name="concessionExpiry" color="primary" >
|
||||
</mat-checkbox>
|
||||
</td>
|
||||
</ng-container>
|
||||
<div *ngIf="isAdmin">
|
||||
<!-- staffFirstName Column -->
|
||||
<ng-container matColumnDef="staffFirstName">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Staff Name</th>
|
||||
<td mat-cell *matCellDef="let element">{{element.staffFirstName}} {{element.staffLastName}} </td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="edit" stickyEnd >
|
||||
<div *ngIf="isAdmin">
|
||||
<th mat-header-cell *matHeaderCellDef>Edit</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
|
||||
<!--a [routerLink]='["/home/concessionvalidation", element.id]' [queryParams]="{returnUrl:'/home/concessionvalidation'}">
|
||||
<mat-icon>edit</mat-icon>
|
||||
</a-->
|
||||
<button mat-icon-button (click)="showEdit(element)" ><mat-icon>edit</mat-icon></button>
|
||||
</td>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="delete" stickyEnd>
|
||||
<th mat-header-cell *matHeaderCellDef>Delete</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<a (click)='deleteItem(element.id)'>
|
||||
<mat-icon>delete</mat-icon>
|
||||
</a>
|
||||
</td>
|
||||
</ng-container>
|
||||
</div>
|
||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;" class="tr-mouseover"></tr>
|
||||
</table>
|
||||
<mat-paginator [pageSize]="10" [pageSizeOptions]="[10, 20]" showFirstLastButtons></mat-paginator>
|
||||
</div>
|
||||
@@ -0,0 +1,170 @@
|
||||
import { Component, OnInit, ViewChild, AfterViewInit, OnDestroy} from '@angular/core';
|
||||
|
||||
import { ConcessionValidation } from '../models';
|
||||
import { MatPaginator } from '@angular/material/paginator';
|
||||
import { MatSort } from '@angular/material/sort';
|
||||
import { MatTableDataSource } from '@angular/material/table';
|
||||
/* ngRx */
|
||||
/*
|
||||
import { Store, select } from '@ngrx/store';
|
||||
import * as validationActions from './store/actions/validationpoint.action';
|
||||
import * as validationSelector from './store/selectors/validationpoint.selector';
|
||||
import { appValidationState } from './store/reducers';
|
||||
*/
|
||||
|
||||
import { Router } from '@angular/router';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { ConcessionValidationService } from './concessionvalidation.service';
|
||||
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { Utils } from '../shares';
|
||||
|
||||
@Component({
|
||||
selector: 'concessionvalidation-list',
|
||||
templateUrl: './concessionvalidation.component.html',
|
||||
styleUrls: ['./concessionvalidation.component.css']
|
||||
})
|
||||
export class ConcessionValidationComponent implements OnInit, AfterViewInit, OnDestroy{
|
||||
dataSource: MatTableDataSource<ConcessionValidation>;
|
||||
isAdmin = false;
|
||||
isAllowFilter = true;
|
||||
fromDate = new Date();
|
||||
toDate = new Date();
|
||||
username = '';
|
||||
private subscription :Subscription = new Subscription();
|
||||
displayedColumns: string[] =
|
||||
[
|
||||
'validateDate',
|
||||
'concessionType',
|
||||
'concessionCard',
|
||||
'concessionHolder',
|
||||
'concessionExpiry',
|
||||
'validationPoint',
|
||||
];
|
||||
msg ="[ConcessionValidation component]";
|
||||
@ViewChild(MatSort) sort!: MatSort;
|
||||
@ViewChild(MatPaginator) paginator!: MatPaginator;
|
||||
|
||||
/*
|
||||
private store: Store<appValidationState>
|
||||
*/
|
||||
constructor(
|
||||
private concessionValidationService: ConcessionValidationService,
|
||||
private router: Router,
|
||||
|
||||
public dialog: MatDialog,
|
||||
) {
|
||||
this.dataSource = new MatTableDataSource<ConcessionValidation>();
|
||||
this.isAdmin = Utils.getIsAdmin();
|
||||
if (this.isAdmin) {
|
||||
this.displayedColumns =
|
||||
[
|
||||
'validateDate',
|
||||
'concessionType',
|
||||
'concessionCard',
|
||||
'concessionHolder',
|
||||
'concessionExpiry',
|
||||
'validationPoint',
|
||||
'staffFirstName',
|
||||
'edit',
|
||||
'delete'
|
||||
];
|
||||
}
|
||||
}
|
||||
/*
|
||||
applyFilter($event:any) {
|
||||
const filterValue = $event.target.value;
|
||||
this.dataSource.filter = filterValue.trim().toLowerCase();
|
||||
}
|
||||
*/
|
||||
ngOnInit(): void
|
||||
{
|
||||
const user = Utils.getCurrentUser();
|
||||
console.log(this.msg + "current login user ", user);
|
||||
if (user.username === "")
|
||||
{
|
||||
user.username = "60249360";
|
||||
//this.toastr.warning("you are not login! using my number " + user.username);
|
||||
}
|
||||
this.username = user.username;
|
||||
if (this.isAdmin)
|
||||
this.username = '';
|
||||
const dateRange = this.concessionValidationService.getDate();
|
||||
console.log("the date range for now ", dateRange);
|
||||
if (dateRange.fromDate != '')
|
||||
this.fromDate = dateRange.fromDate;
|
||||
if (dateRange.toDate != '')
|
||||
this.toDate = dateRange.toDate;
|
||||
this.onLoad();
|
||||
/*
|
||||
this.store.dispatch(validationActions.LoadValidationpoints());
|
||||
this.store.pipe(select(validationSelector.getAllValidations)).subscribe(result => this.dataSource.data = result);
|
||||
*/
|
||||
}
|
||||
|
||||
ngAfterViewInit(): void {
|
||||
this.dataSource.sort = this.sort;
|
||||
this.dataSource.paginator = this.paginator;
|
||||
}
|
||||
onLoad() :void {
|
||||
const cDate = this.fromDate;
|
||||
const tDate = this.toDate;
|
||||
|
||||
this.subscription.add(
|
||||
this.concessionValidationService.loadConcessionvalidationByStaffId(this.username, cDate, tDate).subscribe(result => {
|
||||
console.log(this.msg + "onInit load Data by staffId "+ this.username, result);
|
||||
this.dataSource.data = result.data;
|
||||
}, error => console.error(error.message))
|
||||
);
|
||||
}
|
||||
setDate() :void {
|
||||
this.concessionValidationService.setDateRange(this.fromDate, this.toDate);
|
||||
}
|
||||
showEdit(item: ConcessionValidation)
|
||||
{
|
||||
console.log(this.msg + "on row click", item);
|
||||
this.setDate();
|
||||
this.router.navigate(['/home/concessionvalidation/'+item.id], { queryParams: {returnUrl:'/home/concessionvalidation' } });
|
||||
}
|
||||
|
||||
deleteItem(id: number): void {
|
||||
const message ="Are you sure you want to delete this?";
|
||||
const title = " Confirmation";
|
||||
/*
|
||||
MessageBox.show(this.dialog, message, title, '', MessageBoxButton.YesNo,
|
||||
false, MessageBoxStyle.Simple, "450px").subscribe(x => {
|
||||
if (x.result == "yes")
|
||||
{
|
||||
this.concessionValidationService.deleteConcessionvalidation(id)
|
||||
.subscribe(result => {
|
||||
console.log(this.msg + " deleteItem success", result);
|
||||
let data = this.dataSource.data;
|
||||
let index: number = data.findIndex(d => d.id === id);
|
||||
console.log(this.msg + "delete from datasource");
|
||||
data.splice(index, 1)
|
||||
this.dataSource.data = data;
|
||||
},
|
||||
error =>
|
||||
{
|
||||
const message = error || error.message;
|
||||
this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
}
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
console.log(this.msg + "click on No to delete");
|
||||
}
|
||||
});
|
||||
*/
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.subscription.unsubscribe();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mat-form-field {
|
||||
font-size: 14px;
|
||||
width: 100%;
|
||||
}
|
||||
td.mat-column-edit, .mat-column-delete {
|
||||
width: 35px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
<div class="edit-content">
|
||||
<div class="title">
|
||||
{{getEditText()}}
|
||||
</div>
|
||||
<form [formGroup]="concessionvalidationForm" (ngSubmit)="onSubmit()" fxLayout="column" fxLayoutGap="10px">
|
||||
<div class="flex flex-row">
|
||||
<mat-card >
|
||||
<!-- OLD one
|
||||
<div *ngIf="isAdmin" fxLayout="row" fxLayout.xs="column" fxLayoutGap="7px" fxLayoutGap.sm="0px" >
|
||||
<mat-form-field appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Choose a date<strong class="app-require">*</strong></mat-label>
|
||||
<input matInput formControlName="validateDate" (focus)="picker.open()" [matDatepicker]="picker">
|
||||
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
|
||||
<mat-datepicker #picker></mat-datepicker>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
-->
|
||||
<!--Date and time picker
|
||||
try this one now -->
|
||||
|
||||
<div *ngIf="isAdmin" >
|
||||
<mat-form-field>
|
||||
<input matInput placeholder="Date Time" formControlName="validateDate">
|
||||
<mat-icon matSuffix matTooltip="click to pick date">today</mat-icon>
|
||||
<!--owl-date-time #dt1></owl-date-time-->
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="grid grid-cols-2 gap-3">
|
||||
<!--end-->
|
||||
<div >
|
||||
<mat-form-field appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Concession Type<strong class="app-require">*</strong></mat-label>
|
||||
<mat-select formControlName="concessionTypeId" required>
|
||||
<mat-option>--</mat-option>
|
||||
<mat-option *ngFor="let concessionType of concessionTypes" [value]="concessionType.id">
|
||||
{{concessionType.description}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="f['concessionTypeId'].hasError('required')">Please choose concession Type</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div>
|
||||
<mat-form-field fxFlex appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Concession Card<strong class="app-require">*</strong></mat-label>
|
||||
<input matInput formControlName="concessionCard" maxlength="60"
|
||||
name="concessionCard" placeholder="Concession Card" required>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div>
|
||||
<mat-form-field fxFlex appearance="outline" [hideRequiredMarker]="true" >
|
||||
<mat-label>Concession Holder<strong class="app-require">*</strong></mat-label>
|
||||
<input matInput formControlName="concessionHolder" maxlength="100" name="" placeholder="Concession Holder" required >
|
||||
</mat-form-field>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<mat-checkbox formControlName="concessionExpiry" color="primary">Expiry date checked</mat-checkbox>
|
||||
</div>
|
||||
|
||||
<div *ngIf="isAdmin" fxLayout="row" fxLayout.xs="column" fxLayoutGap="7px" fxLayoutGap.sm="0px">
|
||||
<mat-form-field fxFlex appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Validation Point<strong class="app-require">*</strong></mat-label>
|
||||
<mat-select formControlName="validationPointId" required (selectionChange)="onSelectionChange($event)">
|
||||
<mat-option>--</mat-option>
|
||||
<mat-option *ngFor="let validationPoint of validationPoints" [value]="validationPoint.id">
|
||||
{{validationPoint.description}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="f['validationPointId'].hasError('required')">Please choose validation Point</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>
|
||||
</mat-card>
|
||||
</div>
|
||||
<div class="flex flex-row gap-2 mt-2 justify-end">
|
||||
<button type="submit" mat-raised-button color="primary" [disabled]="isFieldsChange">Submit</button>
|
||||
<button type="button" mat-raised-button color="primary" (click)="goBack()">Cancel</button>
|
||||
</div>
|
||||
</form>
|
||||
<!--pre>{{ concessionvalidationForm.value|json}}</pre-->
|
||||
</div>
|
||||
@@ -0,0 +1,282 @@
|
||||
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
|
||||
import { Router, ActivatedRoute } from '@angular/router';
|
||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||
|
||||
import {ConcessionValidation, Lookup, ResultModel} from '../models';
|
||||
import { Subject,Subscription } from 'rxjs';
|
||||
import { LookupService} from '../shares';
|
||||
import { ConcessionValidationService } from './concessionvalidation.service';
|
||||
import { Utils } from '../shares';
|
||||
import { MatSelectChange } from '@angular/material/select';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import moment from 'moment';
|
||||
|
||||
import { ThemePalette } from '@angular/material/core';
|
||||
|
||||
|
||||
@Component({
|
||||
templateUrl: 'concessionvalidation.edit.component.html',
|
||||
selector: 'concessionvalidation-edit',
|
||||
styleUrls: ['concessionvalidation.edit.component.css']
|
||||
})
|
||||
export class ConcessionValidationEditComponent implements OnInit, OnDestroy {
|
||||
returnUrl="";
|
||||
msg = "[concessionvalidation edit Component] "
|
||||
isChange = true; // disable use false//true for not disable. make sure it true is disable button.
|
||||
subChanged$ = new Subject<boolean>();
|
||||
_id = -1;
|
||||
isAdmin = false;
|
||||
concessionTypes?: Lookup[];
|
||||
validationPoints?: Lookup[];
|
||||
public color: ThemePalette = 'primary';
|
||||
public minDate: moment.Moment|null = null;
|
||||
public maxDate: moment.Moment|null = null;
|
||||
private subscription :Subscription = new Subscription();
|
||||
concessionvalidationForm:FormGroup;
|
||||
|
||||
constructor(private formBuilder: FormBuilder,
|
||||
private lookupService: LookupService,
|
||||
private concessionValidationService: ConcessionValidationService,
|
||||
private router: Router,
|
||||
public dialog: MatDialog,
|
||||
|
||||
private route :ActivatedRoute) {
|
||||
this.concessionvalidationForm = this.formBuilder.group({
|
||||
id: [0], //Validators.required
|
||||
validateDate: [], //Validators.required
|
||||
concessionCard: ['',Validators.required],
|
||||
concessionHolder: ['', Validators.required],
|
||||
concessionExpiry: [false], //Validators.required
|
||||
concessionTypeId: [-1,Validators.min(1)],
|
||||
stafflinkNo: [''], //Validators.required
|
||||
validationPointId: [-1,Validators.min(1)],
|
||||
validationPoint: [''], //Validators.required
|
||||
staffFirstName: [''], //Validators.required
|
||||
staffLastName: [''], //Validators.required
|
||||
staffEmail: [''], //Validators.required
|
||||
active: [false], //Validators.required
|
||||
});
|
||||
/*
|
||||
this.concessionTypes = [];
|
||||
let item:Lookup = {id:1,categoryId:0, description:'Health Care Card'};
|
||||
this.concessionTypes.push(item);
|
||||
item = {id:3,categoryId:1, description:'Gold Veterans Affairs Card'};
|
||||
this.concessionTypes.push(item);
|
||||
item = {id:3,categoryId:1, description:'Pensioner Concession Card'};
|
||||
this.concessionTypes.push(item);
|
||||
*/
|
||||
|
||||
}
|
||||
ngOnInit():void {
|
||||
|
||||
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
|
||||
const id = Number(this.route.snapshot.paramMap.get('id'));
|
||||
|
||||
// now load thing up
|
||||
this._id = id;
|
||||
|
||||
this.isAdmin = Utils.getIsAdmin();
|
||||
|
||||
this.subscription.add(this.lookupService.loadConcessionType().subscribe(x => this.concessionTypes = x.data,
|
||||
error => console.error(error)) );
|
||||
this.subscription.add(this.lookupService.loadValidationPoint().subscribe(x => this.validationPoints = x.data,
|
||||
error => console.error(error)) );
|
||||
this.subscription.add(this.concessionvalidationForm.valueChanges.subscribe(x => this.isChange = false));
|
||||
this.subscription.add(this.subChanged$.subscribe(x => this.isChange = x));
|
||||
const user = Utils.getCurrentUser();
|
||||
|
||||
console.log(this.msg + "current login user ", user);
|
||||
if (user.username === "")
|
||||
{
|
||||
user.username = "60249360";
|
||||
// this.toastr.warning("you are not login! using my number " + user.username);
|
||||
}
|
||||
|
||||
if (this._id < 1)
|
||||
{
|
||||
this.concessionvalidationForm.patchValue({
|
||||
validateDate: new Date(),
|
||||
stafflinkNo: user.username,
|
||||
staffFirstName: user.firstName,
|
||||
staffLastName: user.lastName,
|
||||
staffEmail: user.email,
|
||||
validationPointId: user.validationPointId,
|
||||
active: true});
|
||||
}
|
||||
else
|
||||
{
|
||||
this.subscription.add(
|
||||
this.concessionValidationService.loadConcessionvalidationById(id)
|
||||
.subscribe({
|
||||
next: x=> this.assignValue(x.data),
|
||||
error: e => console.error(e.message)
|
||||
})
|
||||
|
||||
);
|
||||
// console.log(this.msg + " load from db"+id);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
get isFieldsChange()
|
||||
{
|
||||
const chan = this.isChange || !this.concessionvalidationForm.valid; // this disable so need true valid = true not
|
||||
const fvalid = this.concessionvalidationForm.valid;
|
||||
// console.log(this.msg + "is fields change is valid: " + fvalid , chan,);
|
||||
return chan;
|
||||
}
|
||||
getEditText(): string {
|
||||
if (this._id > 0)
|
||||
return "Edit Concession Validation";
|
||||
else
|
||||
return "New Concession Validation";
|
||||
}
|
||||
onChangeValidation($event:Event) {
|
||||
//$event.target.value
|
||||
//this.selectedCar = (event.target as HTMLSelectElement).value;
|
||||
var val = ($event.target as HTMLSelectElement).value;
|
||||
// console.log("the log for val " , val);
|
||||
}
|
||||
onSelectionChange($event:MatSelectChange) {
|
||||
const text = $event.source.triggerValue;
|
||||
// console.log("this is selectionchange "+ "'" + text + "'");
|
||||
this.concessionvalidationForm.patchValue({validationPoint: text});
|
||||
}
|
||||
assignValue(concessionvalidation:ConcessionValidation):void {
|
||||
this.concessionvalidationForm.patchValue({
|
||||
id: concessionvalidation.id,
|
||||
validateDate: concessionvalidation.validateDate,
|
||||
concessionCard: concessionvalidation.concessionCard,
|
||||
concessionHolder: concessionvalidation.concessionHolder,
|
||||
concessionExpiry: concessionvalidation.concessionExpiry,
|
||||
concessionTypeId: concessionvalidation.concessionTypeId,
|
||||
stafflinkNo: concessionvalidation.stafflinkNo,
|
||||
staffFirstName: concessionvalidation.staffFirstName,
|
||||
staffLastName: concessionvalidation.staffLastName,
|
||||
staffEmail: concessionvalidation.staffEmail,
|
||||
validationPointId: concessionvalidation.validationPointId,
|
||||
active: concessionvalidation.active,
|
||||
});
|
||||
// disable use false//true for not disable.
|
||||
this.subChanged$.next(true);
|
||||
|
||||
}
|
||||
|
||||
// convenience getter for easy access in form fields
|
||||
get f() { return this.concessionvalidationForm.controls;}
|
||||
|
||||
onSubmit() :void {
|
||||
const OkToSave = this.concessionvalidationForm.valid;
|
||||
if (OkToSave)
|
||||
{
|
||||
const concessionvalidationValue = this.concessionvalidationForm.value;
|
||||
const concessionvalidation:ConcessionValidation = {
|
||||
id: concessionvalidationValue.id,
|
||||
validateDate: moment(concessionvalidationValue.validateDate).toDate(),
|
||||
concessionCard: concessionvalidationValue.concessionCard,
|
||||
concessionHolder: concessionvalidationValue.concessionHolder,
|
||||
concessionExpiry: concessionvalidationValue.concessionExpiry,
|
||||
concessionTypeId: concessionvalidationValue.concessionTypeId,
|
||||
stafflinkNo: concessionvalidationValue.stafflinkNo,
|
||||
staffFirstName: concessionvalidationValue.staffFirstName,
|
||||
staffLastName: concessionvalidationValue.staffLastName,
|
||||
staffEmail: concessionvalidationValue.staffEmail,
|
||||
validationPointId: concessionvalidationValue.validationPointId,
|
||||
active: concessionvalidationValue.active,
|
||||
};
|
||||
// console.log(this.msg + "this is OKTOsave", concessionvalidation);
|
||||
//if edit mode just save it don't check
|
||||
if (concessionvalidation.id > 0) {
|
||||
this.saveConcession(concessionvalidation);
|
||||
}
|
||||
else {
|
||||
//check first only if new
|
||||
this.checkAndSave(concessionvalidation);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// console.log(this.msg + "this is NOT OKTOsave");
|
||||
//this.toastr.error("please fill in the required fields");
|
||||
}
|
||||
}
|
||||
|
||||
checkAndSave(concessionvalidation: ConcessionValidation) :void {
|
||||
const currentDate = moment(concessionvalidation.validateDate).format("YYYY-MM-DD");
|
||||
const id = concessionvalidation.id;
|
||||
this.subscription.add(
|
||||
this.concessionValidationService.checkConcessionValidationByStaff(concessionvalidation.stafflinkNo,
|
||||
concessionvalidation.concessionCard, currentDate, id)
|
||||
.subscribe ( x =>
|
||||
{
|
||||
let okTo = true;
|
||||
if (x.data < 0)
|
||||
{
|
||||
const message = "This card was used earlier today. Is it Ok to continue?";
|
||||
const title ="Alert";
|
||||
/*
|
||||
okTo = confirm(message);
|
||||
if (okTo == true)
|
||||
{
|
||||
this.saveConcession(concessionvalidation);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.router.navigate([this.returnUrl]);
|
||||
}
|
||||
*/
|
||||
/*
|
||||
MessageBox.show(this.dialog, message, title,
|
||||
'', MessageBoxButton.YesNo,
|
||||
false, MessageBoxStyle.Simple, "400px").subscribe(x => {
|
||||
if (x.result === "yes")
|
||||
{
|
||||
//console.log(this.msg + "after confirm", x);
|
||||
this.saveConcession(concessionvalidation);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.router.navigate([this.returnUrl]);
|
||||
}
|
||||
});
|
||||
*/
|
||||
}
|
||||
else
|
||||
{
|
||||
this.saveConcession(concessionvalidation);
|
||||
}
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
saveConcession(concessionvalidation: ConcessionValidation) :void {
|
||||
//console.log(this.msg + " Save Concession validation to server");
|
||||
this.subscription.add(
|
||||
this.concessionValidationService.saveConcessionvalidation(concessionvalidation)
|
||||
.subscribe({
|
||||
next: x => {
|
||||
if (x.statusCode >= 1) {
|
||||
//this.toastr.success("Save is ok");
|
||||
this.router.navigate([this.returnUrl]);
|
||||
}
|
||||
|
||||
//this.toastr.error("Fail to Save " + x.message);
|
||||
}, error: e => {
|
||||
const message = e || e.message;
|
||||
//this.toastr.error(message);
|
||||
console.log("error ", e);
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
goBack(): void {
|
||||
this.router.navigate([this.returnUrl]);
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.subscription.unsubscribe();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
import { Injectable, Inject } from '@angular/core';
|
||||
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ConcessionValidation, ResultModel, ConfigureUrl } from '../models';
|
||||
import moment from 'moment';
|
||||
import { AppSettingService } from '../shares';
|
||||
@Injectable({ providedIn: 'root' })
|
||||
export class ConcessionValidationService {
|
||||
private dateRange:any;
|
||||
constructor(private http: HttpClient,
|
||||
private appSetting :AppSettingService
|
||||
) {
|
||||
this.dateRange = {};
|
||||
this.dateRange.fromDate = '';
|
||||
this.dateRange.toDate = '';
|
||||
console.log("constructor concessionValidationService daterange", this.dateRange);
|
||||
}
|
||||
public setDateRange(fromDate:any, toDate:any)
|
||||
{
|
||||
this.dateRange.fromDate = moment(fromDate).toDate();
|
||||
this.dateRange.toDate = moment(toDate).toDate();
|
||||
console.log("concessionValidationService setdaterange", this.dateRange);
|
||||
}
|
||||
public getDate() :any {
|
||||
console.log("concessionValidationService getdaterange", this.dateRange);
|
||||
return this.dateRange;
|
||||
}
|
||||
loadConcessionvalidations(): Observable<ResultModel<ConcessionValidation[]>> {
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl +"/"+ConfigureUrl.concessionValidationUrl;
|
||||
let config = { headers : { 'Content-Type': 'application/json' } };
|
||||
// console.log("the concession", baseUrl);
|
||||
return this.http.get<ResultModel<ConcessionValidation[]>>(baseUrl);
|
||||
}
|
||||
loadConcessionvalidationByStaffId(staffLinkId:string, fromDate:Date, toDate:Date): Observable<ResultModel<ConcessionValidation[]>> {
|
||||
const strDate = moment(fromDate).format("YYYY-MM-DD");
|
||||
const strtoDate = moment(toDate).format("YYYY-MM-DD");
|
||||
const url = this.appSetting.appSetting.baseUrl + "/" +ConfigureUrl.concessionValidationByIdUrl;
|
||||
const params = new HttpParams().set("staffLinkNo", staffLinkId)
|
||||
.set("fromDate", strDate)
|
||||
.set("toDate", strtoDate);
|
||||
const headers = new HttpHeaders().set('Content-Type', 'application/json');
|
||||
const options = {
|
||||
headers: headers,
|
||||
params: params
|
||||
};
|
||||
console.log("loadConcessionvalidationByStaffId url", url);
|
||||
return this.http.get<ResultModel<ConcessionValidation[]>>(url, options);
|
||||
}
|
||||
loadConcessionvalidationById(id:number): Observable<ResultModel<ConcessionValidation>> {
|
||||
let params = new HttpParams().set("id", ""+id);
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl +"/"+ConfigureUrl.concessionValidationUrl;
|
||||
let headers = new HttpHeaders().set('Content-Type', 'application/json');
|
||||
let options = {
|
||||
headers: headers,
|
||||
params: params
|
||||
};
|
||||
//return this.http.get<Concessionvalidation>(this.baseUrl + 'api/Concessionvalidation/LoadConcessionvalidationById',options);
|
||||
return this.http.get<ResultModel<ConcessionValidation>>(baseUrl + "/" + id);
|
||||
}
|
||||
checkConcessionValidationByStaff(staffLinkNo:string, concessionCard: string, currentDate:string, id :number): Observable<ResultModel<number>> {
|
||||
let params = new HttpParams().set("staffLinkNo", staffLinkNo)
|
||||
.set("concessionCard", concessionCard)
|
||||
.set("currentDate", currentDate)
|
||||
.set("id", "" +id);
|
||||
|
||||
let headers = new HttpHeaders().set('Content-Type', 'application/json');
|
||||
let options = {
|
||||
headers: headers,
|
||||
params: params
|
||||
};
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl;
|
||||
const url = baseUrl + "/" + ConfigureUrl.CheckConcessionValidationByStaffUrl;
|
||||
//return this.http.get<Concessionvalidation>(this.baseUrl + 'api/Concessionvalidation/LoadConcessionvalidationById',options);
|
||||
return this.http.get<ResultModel<number>>(url,options);
|
||||
}
|
||||
saveConcessionvalidation(item:ConcessionValidation): Observable<ResultModel<number>> { //insert Concessionvalidation
|
||||
let config = { headers : { 'Content-Type': 'application/json' } };
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl +"/"+ConfigureUrl.concessionValidationUrl;
|
||||
return this.http.post<ResultModel<number>>(baseUrl, item, config);
|
||||
}
|
||||
deleteConcessionvalidation(Id:number): Observable<ResultModel<number>>{
|
||||
let config = { headers : { 'Content-Type': 'application/json' } };
|
||||
const baseUrl = this.appSetting.appSetting.baseUrl +"/"+ConfigureUrl.concessionValidationUrl;
|
||||
return this.http.delete<ResultModel<number>>(baseUrl + "/" + Id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
export * from './concessionvalidation.component';
|
||||
export * from './concessionvalidation.edit.component';
|
||||
export * from './concessionvalidation.service';
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mat-form-field {
|
||||
font-size: 14px;
|
||||
width: 100%;
|
||||
}
|
||||
td.mat-column-edit, .mat-column-delete {
|
||||
width: 35px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
<div class="edit-content">
|
||||
<h3>Concession Type</h3>
|
||||
<div class="addlink">
|
||||
<a [routerLink]='["/home/concessiontype", 0]' [queryParams]="{returnUrl:'/home/concessiontype'}">
|
||||
<i class="material-icons">playlist_add</i>
|
||||
Add Concession Type
|
||||
</a>
|
||||
</div>
|
||||
<table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z8">
|
||||
|
||||
<!-- Desciption Column -->
|
||||
<ng-container matColumnDef="description">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Concession Type</th>
|
||||
<td mat-cell *matCellDef="let element"> {{element.description}} </td>
|
||||
</ng-container>
|
||||
|
||||
<!-- active Column -->
|
||||
<ng-container matColumnDef="active">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>Active</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<mat-checkbox [checked] ="element.active" name="active" color="primary" >
|
||||
</mat-checkbox>
|
||||
</td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="edit" stickyEnd>
|
||||
<th mat-header-cell *matHeaderCellDef>Edit</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<a [routerLink]='["/home/concessiontype", element.id]' [queryParams]="{returnUrl:'/home/concessiontype'}">
|
||||
<mat-icon>edit</mat-icon>
|
||||
</a>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;" class="selection-pointer tr-mouseover" (click)="showEdit(row)"></tr>
|
||||
|
||||
</table>
|
||||
|
||||
<mat-paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 20]" showFirstLastButtons></mat-paginator>
|
||||
</div>
|
||||
@@ -0,0 +1,105 @@
|
||||
import { Component, Inject, OnInit, ViewChild, AfterViewInit, OnDestroy} from '@angular/core';
|
||||
import { ConcessionTypeService } from './concessiontype.service';
|
||||
import { ConcessionType } from '../models';
|
||||
import { MatPaginator } from '@angular/material/paginator';
|
||||
import { MatSort } from '@angular/material/sort';
|
||||
import { MatTableDataSource } from '@angular/material/table';
|
||||
|
||||
/* ngRx
|
||||
import { Store, select } from '@ngrx/store';
|
||||
import * as validationActions from './store/actions/validationpoint.action';
|
||||
import * as validationSelector from './store/selectors/validationpoint.selector';
|
||||
import { appValidationState } from './store/reducers';
|
||||
*/
|
||||
import { take } from 'rxjs/operators';
|
||||
import { Router } from '@angular/router';
|
||||
import { Subscription } from 'rxjs';
|
||||
@Component({
|
||||
selector: 'concessiontype-list',
|
||||
templateUrl: './concessiontype.component.html',
|
||||
styleUrls: ['./concessiontype.component.css']
|
||||
})
|
||||
export class ConcessionTypeComponent implements OnInit, AfterViewInit, OnDestroy{
|
||||
dataSource: MatTableDataSource<ConcessionType>;
|
||||
|
||||
private subscription:Subscription = new Subscription();
|
||||
|
||||
displayedColumns: string[] = [ 'description','active', 'edit'];
|
||||
msg ="[concessionType.com]";
|
||||
@ViewChild(MatSort) sort!: MatSort;
|
||||
@ViewChild(MatPaginator) paginator!: MatPaginator;
|
||||
|
||||
|
||||
/*
|
||||
private store: Store<appValidationState>
|
||||
*/
|
||||
constructor(
|
||||
private concessionTypeService: ConcessionTypeService,
|
||||
|
||||
private router: Router
|
||||
) {
|
||||
|
||||
this.dataSource = new MatTableDataSource<ConcessionType>();
|
||||
}
|
||||
/*
|
||||
applyFilter($event:any) {
|
||||
const filterValue = $event.target.value;
|
||||
this.dataSource.filter = filterValue.trim().toLowerCase();
|
||||
}
|
||||
*/
|
||||
ngOnInit(): void
|
||||
{
|
||||
this.subscription.add(
|
||||
this.concessionTypeService.loadConcessiontypes().subscribe(result => {
|
||||
// console.log(this.msg + "onInit", result);
|
||||
this.dataSource.data = result.data;
|
||||
}, error => {
|
||||
const message = error || error.message;
|
||||
// this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
/*
|
||||
this.store.dispatch(validationActions.LoadValidationpoints());
|
||||
this.store.pipe(select(validationSelector.getAllValidations)).subscribe(result => this.dataSource.data = result);
|
||||
*/
|
||||
}
|
||||
ngAfterViewInit(): void {
|
||||
this.dataSource.sort = this.sort;
|
||||
this.dataSource.paginator = this.paginator;
|
||||
}
|
||||
|
||||
showEdit(item: ConcessionType)
|
||||
{
|
||||
console.log(this.msg + "on row click", item);
|
||||
this.router.navigate(['/home/concessiontype/'+item.id], { queryParams: {returnUrl:'/home/concessiontype' } });
|
||||
}
|
||||
deleteItem(id: number): void {
|
||||
|
||||
this.concessionTypeService.deleteConcessiontype(id)
|
||||
.pipe(take(1))
|
||||
.subscribe(result => {
|
||||
// console.log(this.msg + " deleteItem success", result);
|
||||
let data = this.dataSource.data;
|
||||
let index: number = data.findIndex(d => d.id === id);
|
||||
// console.log(this.msg + "delete from datasource");
|
||||
data.splice(index, 1)
|
||||
this.dataSource.data = data;
|
||||
},
|
||||
error => {
|
||||
const message = error || error.message;
|
||||
// this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
}
|
||||
);
|
||||
|
||||
}
|
||||
ngOnDestroy() {
|
||||
this.subscription.unsubscribe();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mat-form-field {
|
||||
font-size: 14px;
|
||||
width: 100%;
|
||||
}
|
||||
td.mat-column-edit, .mat-column-delete {
|
||||
width: 35px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<div class="edit-content">
|
||||
<div class="title"> {{getEditText()}} </div>
|
||||
<form [formGroup]="concessiontypeForm" (ngSubmit)="onSubmit()" class="flex flex-column">
|
||||
<div >
|
||||
<mat-card >
|
||||
<input type="hidden" formControlName="id">
|
||||
<div >
|
||||
<mat-form-field fxFlex appearance="outline" [hideRequiredMarker]="true">
|
||||
<mat-label>Concession Type<strong class="app-require">*</strong></mat-label>
|
||||
<input matInput formControlName="description" maxlength="80" name="Concession Type" placeholder="description" required>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div >
|
||||
<mat-checkbox formControlName="active" color="primary">Active</mat-checkbox>
|
||||
</div>
|
||||
</mat-card>
|
||||
</div>
|
||||
<div class="flex flex-row gap-2 mt-2">
|
||||
<button type="submit" mat-raised-button color="primary" [disabled]="isFieldsChange">Submit</button>
|
||||
<button type="button" mat-raised-button color="primary" (click)="goBack()">Cancel</button>
|
||||
</div>
|
||||
</form>
|
||||
<!--pre>{{ concessiontypeForm.value|json}}</pre-->
|
||||
</div>
|
||||
@@ -0,0 +1,120 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
|
||||
import { Router, ActivatedRoute } from '@angular/router';
|
||||
|
||||
import {ConcessionType} from '../models';
|
||||
import { Subject, pipe ,Subscription} from 'rxjs';
|
||||
import {ConcessionTypeService} from './concessiontype.service';
|
||||
|
||||
@Component({
|
||||
templateUrl: 'concessiontype.edit.component.html',
|
||||
selector: 'concessiontype-edit',
|
||||
styleUrls: ['concessiontype.edit.component.css']
|
||||
})
|
||||
export class ConcessiontypeEditComponent implements OnInit {
|
||||
returnUrl = '';
|
||||
_id =-1;
|
||||
msg="[Concession type edit Component] ";
|
||||
isChange = true; // disable use false//true for not disable. make sure it true is disable button.
|
||||
private subscription:Subscription = new Subscription();
|
||||
subChanged$ = new Subject<boolean>();
|
||||
concessiontypeForm: FormGroup;
|
||||
|
||||
constructor(private formBuilder: FormBuilder,
|
||||
|
||||
private concessionTypeService: ConcessionTypeService,
|
||||
private route: ActivatedRoute,private router: Router) {
|
||||
this.concessiontypeForm = this.formBuilder.group({
|
||||
id: [0], //Validators.required
|
||||
description: [''], //Validators.required
|
||||
display: [''], //Validators.required
|
||||
active: [false], //Validators.required
|
||||
});
|
||||
}
|
||||
ngOnInit():void {
|
||||
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
|
||||
const id = Number(this.route.snapshot.paramMap.get('id'));
|
||||
// now load thing up
|
||||
this.subscription.add(this.concessiontypeForm.valueChanges.subscribe(x => this.isChange = false));
|
||||
this.subscription.add(this.subChanged$.subscribe(x => this.isChange = x));
|
||||
if (id > 0)
|
||||
{
|
||||
this.subscription.add(
|
||||
this.concessionTypeService.loadConcessiontypeById(id).subscribe(x => {
|
||||
this.assignValue(x.data)
|
||||
}, error => {
|
||||
const message = error || error.message;
|
||||
//this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
}
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
getEditText(): string {
|
||||
if (this._id > 0)
|
||||
return "Edit Concession Type";
|
||||
else
|
||||
return "New Concession Type";
|
||||
}
|
||||
// this for disable submit button
|
||||
get isFieldsChange() {
|
||||
const chan = this.isChange || !this.concessiontypeForm.valid; // this disable so need true valid = true not
|
||||
//console.log(this.msg + 'is fields change', chan);
|
||||
return chan;
|
||||
}
|
||||
assignValue(concessiontype:ConcessionType):void {
|
||||
this.concessiontypeForm.patchValue({
|
||||
id: concessiontype.id,
|
||||
description: concessiontype.description,
|
||||
display: concessiontype.display,
|
||||
active: concessiontype.active,
|
||||
});
|
||||
// disable use false//true for not disable.
|
||||
this.subChanged$.next(true);
|
||||
|
||||
}
|
||||
|
||||
// convenience getter for easy access in form fields
|
||||
get f() { return this.concessiontypeForm.controls;}
|
||||
|
||||
onSubmit() :void {
|
||||
// if form valid then go save
|
||||
//make sure
|
||||
const okToSave = this.concessiontypeForm.valid;
|
||||
if (okToSave)
|
||||
{
|
||||
let concessiontypeValue = this.concessiontypeForm.value;
|
||||
let concessiontype: ConcessionType = {
|
||||
id: concessiontypeValue.id,
|
||||
description: concessiontypeValue.description,
|
||||
display: concessiontypeValue.display,
|
||||
active: concessiontypeValue.active,
|
||||
};
|
||||
|
||||
this.subscription.add( this.concessionTypeService.saveConcessiontype(concessiontype).subscribe(x => {
|
||||
//console.log("after save return is", x);
|
||||
if (x.statusCode > 0)
|
||||
{
|
||||
//alert("save ok");
|
||||
//this.toastr.success("save is ok");
|
||||
this.router.navigate([this.returnUrl]);
|
||||
//this.router.navigate(['/home/concessiontype'])
|
||||
}
|
||||
},
|
||||
error => {
|
||||
const message = error || error.message;
|
||||
//this.toastr.error(message);
|
||||
console.log("error ", error);
|
||||
}
|
||||
) );
|
||||
}
|
||||
}
|
||||
goBack(): void {
|
||||
this.router.navigate([this.returnUrl]);
|
||||
}
|
||||
ngOnDestroy() {
|
||||
this.subscription.unsubscribe();
|
||||
}
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user