Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 17acb358d9 | |||
| f2afe92991 | |||
| edc56138d5 | |||
| 97f2a8851d | |||
| 1bdde40409 | |||
| 286075da19 |
@@ -0,0 +1,50 @@
|
||||
name: Validar AT
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- develop
|
||||
|
||||
jobs:
|
||||
validate:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Obtener código
|
||||
uses: https://github.com/actions/checkout@v4
|
||||
|
||||
- name: Configurar Node.js
|
||||
uses: https://github.com/actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: .nvmrc
|
||||
cache: npm
|
||||
|
||||
- name: Mostrar versiones
|
||||
run: |
|
||||
node --version
|
||||
npm --version
|
||||
|
||||
- name: Instalar dependencias
|
||||
run: npm ci
|
||||
|
||||
- name: Build obligatorio
|
||||
run: npm run build
|
||||
|
||||
deploy-dev:
|
||||
needs: validate
|
||||
if: github.event_name == 'push' && github.ref_name == 'develop'
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Desplegar AT en pruebas
|
||||
uses: CIDWA/infra-actions/deploy-ssh@main
|
||||
with:
|
||||
ssh-private-key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
|
||||
known-hosts: ${{ secrets.DEPLOY_KNOWN_HOSTS }}
|
||||
host: 10.10.10.11
|
||||
user: deploy
|
||||
deploy-script: /var/deploy/scripts/deploy-node-app.sh at-dev
|
||||
commit-sha: ${{ github.sha }}
|
||||
@@ -175,7 +175,7 @@ export default function PorServicio() {
|
||||
const colors = ["black", "red", "blue", "orange", "purple", "green"];
|
||||
|
||||
return (
|
||||
<div style={{ display: "flex", flexDirection: "column", gap: "30px" }}>
|
||||
<div style={{ display: "flex", flexDirection: "column", gap: "5px", overflow: "auto" }}>
|
||||
|
||||
<PeriodoPicker
|
||||
onChange={(p1, p2) => {
|
||||
@@ -196,6 +196,9 @@ export default function PorServicio() {
|
||||
gap: "20px",
|
||||
flexWrap: "wrap",
|
||||
padding: "10px 0",
|
||||
position: "absolute",
|
||||
top: "34px",
|
||||
right: "0",
|
||||
}}
|
||||
>
|
||||
<button
|
||||
@@ -215,7 +218,7 @@ export default function PorServicio() {
|
||||
fontWeight: "bold",
|
||||
}}
|
||||
>
|
||||
Exportar a Excel
|
||||
Excel
|
||||
</button>
|
||||
|
||||
{data.map((servicio) => (
|
||||
@@ -226,6 +229,7 @@ export default function PorServicio() {
|
||||
alignItems: "center",
|
||||
gap: "5px",
|
||||
whiteSpace: "nowrap",
|
||||
fontSize:"9px"
|
||||
}}
|
||||
>
|
||||
<input
|
||||
@@ -262,6 +266,7 @@ export default function PorServicio() {
|
||||
gap: "30px",
|
||||
alignItems: "flex-start",
|
||||
flexWrap: "wrap",
|
||||
overflow: "auto"
|
||||
}}
|
||||
>
|
||||
{/* COLUMNA IZQUIERDA: TABLA */}
|
||||
|
||||
@@ -7,12 +7,16 @@ import PorServicios from "@/app/Components/Reportes/porServicio";
|
||||
import PorRecibos from "@/app/Components/Reportes/porRecibo";
|
||||
import MonthYearPicker from "@/app/Components/MonthYearPicker/MonthYearPicker";
|
||||
import PeriodoPicker from "@/app/Components/PeriodoPicker/periodoPicker";
|
||||
import { useRouter } from "next/navigation";
|
||||
import PorServicio from "../Reportes-graficas/page";
|
||||
|
||||
export default function ReportesClient({
|
||||
defaultKey,
|
||||
}: {
|
||||
defaultKey?: string;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
|
||||
const [desde, setDesde] = useState<string | null>(null);
|
||||
const [hasta, setHasta] = useState<string | null>(null);
|
||||
const [periodo1, setPeriodo1] = useState<any>(null);
|
||||
@@ -43,26 +47,13 @@ export default function ReportesClient({
|
||||
{
|
||||
key: "Por Servicio",
|
||||
label: "Por Servicio",
|
||||
content: (
|
||||
<div style={{ maxHeight: "400px", width: "100%", overflow: "visible" }}>
|
||||
<PeriodoPicker
|
||||
onChange={(p1, p2) => {
|
||||
setPeriodo1(p1);
|
||||
setPeriodo2(p2);
|
||||
}}
|
||||
/>
|
||||
{periodo1 && periodo2 && (
|
||||
<PorServicios
|
||||
key={`${periodo1?.id_periodo}-${periodo2?.id_periodo}`}
|
||||
periodo1={periodo1}
|
||||
periodo2={periodo2}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
),
|
||||
content: null,
|
||||
}
|
||||
]}
|
||||
/>
|
||||
{defaultKey == "Por Servicio" &&
|
||||
<PorServicio/>
|
||||
}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ interface ToggleOption {
|
||||
key: string;
|
||||
label: string;
|
||||
content: ReactNode | (() => ReactNode);
|
||||
onClick?: () => void;
|
||||
}
|
||||
|
||||
interface ToggleProps {
|
||||
|
||||
+1
-1
@@ -109,7 +109,7 @@ footer p {
|
||||
height: 600px;
|
||||
min-height: 520px;
|
||||
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
|
||||
overflow: auto;
|
||||
overflow: hidden;
|
||||
background-color: #f9f9f9;
|
||||
z-index: 0;
|
||||
animation: fadeInUp 1s ease forwards;
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ export const metadata: Metadata = {
|
||||
authors: [{ name: "FES Acatlán" }],
|
||||
creator: "Lino,Carlos,Axel",
|
||||
icons: {
|
||||
icon: "/icon.svg",
|
||||
icon: [{ url: "/icon.ico" }, { url: "/icon.png" }, { url: "/icon.svg" }],
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
module.exports = {
|
||||
apps: [
|
||||
{
|
||||
name: "at-dev",
|
||||
cwd: "/var/www/html/front/pruebas/at",
|
||||
script: "node_modules/next/dist/bin/next",
|
||||
args: "start",
|
||||
|
||||
interpreter: "/home/deploy/.nvm/versions/node/v22.21.1/bin/node",
|
||||
|
||||
env: {
|
||||
NODE_ENV: "production",
|
||||
PORT: 3356,
|
||||
HOSTNAME: "0.0.0.0",
|
||||
},
|
||||
|
||||
autorestart: true,
|
||||
watch: false,
|
||||
min_uptime: "10s",
|
||||
max_restarts: 10,
|
||||
restart_delay: 3000,
|
||||
time: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
Generated
+22
@@ -32,6 +32,10 @@
|
||||
"@types/react-dom": "^19",
|
||||
"sass-embedded": "^1.97.3",
|
||||
"typescript": "^5"
|
||||
},
|
||||
"engines": {
|
||||
"node": "22.21.1",
|
||||
"npm": "10.9.4"
|
||||
}
|
||||
},
|
||||
"node_modules/@bufbuild/protobuf": {
|
||||
@@ -696,6 +700,7 @@
|
||||
"version": "2.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
|
||||
"integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@@ -735,6 +740,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -755,6 +761,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -775,6 +782,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -795,6 +803,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -815,6 +824,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -835,6 +845,7 @@
|
||||
"cpu": [
|
||||
"arm"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -855,6 +866,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -875,6 +887,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -895,6 +908,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -915,6 +929,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -935,6 +950,7 @@
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -955,6 +971,7 @@
|
||||
"cpu": [
|
||||
"ia32"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -975,6 +992,7 @@
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
@@ -2635,6 +2653,7 @@
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"engines": {
|
||||
@@ -2677,6 +2696,7 @@
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"dependencies": {
|
||||
@@ -3190,6 +3210,7 @@
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
|
||||
"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
@@ -3290,6 +3311,7 @@
|
||||
"version": "4.0.4",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
|
||||
"integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"engines": {
|
||||
|
||||
+6
-1
@@ -33,5 +33,10 @@
|
||||
"@types/react-dom": "^19",
|
||||
"sass-embedded": "^1.97.3",
|
||||
"typescript": "^5"
|
||||
}
|
||||
},
|
||||
"engines": {
|
||||
"node": "22.21.1",
|
||||
"npm": "10.9.4"
|
||||
},
|
||||
"packageManager": "npm@10.9.4"
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 91 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
Reference in New Issue
Block a user