prisma actualizado. toma en cuenta las relaciones tareas-planilla y planilla-tareas
Some checks failed
build-and-deploy / filter (push) Successful in 2s
Sync to GitHub / sync (push) Failing after 1s
build-and-deploy / build (push) Failing after 21s
build-and-deploy / deploy (push) Has been skipped

This commit is contained in:
2025-05-30 15:52:54 -06:00
parent 3c2c80d5ee
commit 031d5c8344
7 changed files with 176 additions and 1171 deletions

1
.env
View File

@@ -1 +1,2 @@
COMPOSE_PROJECT_NAME=planilla
OPENAI_API_KEY=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

26
.vscode/tasks.json vendored Normal file
View File

@@ -0,0 +1,26 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Dev API",
"type": "shell",
"command": "cd api; npm install; npx nodemon server.js",
"problemMatcher": [],
"isBackground": true,
"group": "build"
},
{
"label": "Dev UI",
"type": "shell",
"command": "cd ui; npm install; npm run dev",
"problemMatcher": [],
"isBackground": true,
"group": "build"
},
{
"label": "Dev All",
"dependsOn": ["Dev API", "Dev UI"],
"dependsOrder": "parallel"
}
]
}

View File

@@ -1,3 +1,5 @@
.SHELLFLAGS = -Command
GITHUB_REPO_URL := https://github.com/josedario87/planilla.git
GITEA_REPO_URL := ssh://<GITEA_USER>@<GITEA_HOST>:<GITEA_PORT>/nucleo000/planilla.git
@@ -41,8 +43,7 @@ sync-to-gitea:
@echo "Synchronization to Gitea complete."
# Declaramos el target como PHONY ya que no corresponde a un archivo real (opcional pero recomendado)
.PHONY: UI
UI:
cd ui && ( if not exist node_modules npm install ) && npm run dev

View File

@@ -0,0 +1,18 @@
-- AlterTable
ALTER TABLE "Asistencia" ALTER COLUMN "created_at" SET DEFAULT (now() AT TIME ZONE 'utc'),
ALTER COLUMN "updated_at" SET DEFAULT (now() AT TIME ZONE 'utc'),
ALTER COLUMN "entrada" SET DEFAULT (now() AT TIME ZONE 'utc');
-- AlterTable
ALTER TABLE "Cliente" ALTER COLUMN "created_at" SET DEFAULT (now() AT TIME ZONE 'utc'),
ALTER COLUMN "updated_at" SET DEFAULT (now() AT TIME ZONE 'utc');
-- AlterTable
ALTER TABLE "Planilla" ALTER COLUMN "created_at" SET DEFAULT (now() AT TIME ZONE 'utc'),
ALTER COLUMN "updated_at" SET DEFAULT (now() AT TIME ZONE 'utc');
-- AlterTable
ALTER TABLE "TareaRealizada" ALTER COLUMN "created_at" SET DEFAULT (now() AT TIME ZONE 'utc');
-- AddForeignKey
ALTER TABLE "TareaRealizada" ADD CONSTRAINT "TareaRealizada_planilla_id_fkey" FOREIGN KEY ("planilla_id") REFERENCES "Planilla"("id") ON DELETE SET NULL ON UPDATE CASCADE;

View File

@@ -72,7 +72,15 @@ C:\no guardar\nucleo V3\planilla\api\prisma\generated\client\runtime\wasm.js
C:\no guardar\nucleo V3\planilla\api\prisma\migrations\20250515020056_init
C:\no guardar\nucleo V3\planilla\api\prisma\migrations\migration_lock.toml
C:\no guardar\nucleo V3\planilla\api\prisma\migrations\20250515020056_init\migration.sql
C:\no guardar\nucleo V3\planilla\api\routes\asistencias
C:\no guardar\nucleo V3\planilla\api\routes\empleados
C:\no guardar\nucleo V3\planilla\api\routes\planillas
C:\no guardar\nucleo V3\planilla\api\routes\tareas
C:\no guardar\nucleo V3\planilla\api\routes\clientesRandom.js
C:\no guardar\nucleo V3\planilla\api\routes\asistencias\asistencias.js
C:\no guardar\nucleo V3\planilla\api\routes\empleados\empleados.js
C:\no guardar\nucleo V3\planilla\api\routes\planillas\planillas.js
C:\no guardar\nucleo V3\planilla\api\routes\tareas\tareas.js
C:\no guardar\nucleo V3\planilla\dev\scripts
C:\no guardar\nucleo V3\planilla\dev\scripts\estructura.ps1
C:\no guardar\nucleo V3\planilla\mcp\Dockerfile
@@ -86,6 +94,7 @@ C:\no guardar\nucleo V3\planilla\ui\index.html
C:\no guardar\nucleo V3\planilla\ui\package-lock.json
C:\no guardar\nucleo V3\planilla\ui\package.json
C:\no guardar\nucleo V3\planilla\ui\README.md
C:\no guardar\nucleo V3\planilla\ui\README.ms
C:\no guardar\nucleo V3\planilla\ui\vite.config.js
C:\no guardar\nucleo V3\planilla\ui\public\vite.svg
C:\no guardar\nucleo V3\planilla\ui\src\assets
@@ -95,6 +104,7 @@ C:\no guardar\nucleo V3\planilla\ui\src\router
C:\no guardar\nucleo V3\planilla\ui\src\stores
C:\no guardar\nucleo V3\planilla\ui\src\tests
C:\no guardar\nucleo V3\planilla\ui\src\views
C:\no guardar\nucleo V3\planilla\ui\src\apiClient.js
C:\no guardar\nucleo V3\planilla\ui\src\App.vue
C:\no guardar\nucleo V3\planilla\ui\src\main.js
C:\no guardar\nucleo V3\planilla\ui\src\style.css
@@ -115,19 +125,22 @@ C:\no guardar\nucleo V3\planilla\ui\src\components\planillas\cardPlanilla.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\planillas\tablaPlanillas.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\tareas\cardTarea.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\tareas\tablaTareas.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\ui\navBar.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\ui\sideDrawer.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\ui\NavBar.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\ui\SideDrawer.vue
C:\no guardar\nucleo V3\planilla\ui\src\components\ui\TopBar.vue
C:\no guardar\nucleo V3\planilla\ui\src\router\index.js
C:\no guardar\nucleo V3\planilla\ui\src\stores\useAsistencias.js
C:\no guardar\nucleo V3\planilla\ui\src\stores\useChat.js
C:\no guardar\nucleo V3\planilla\ui\src\stores\useEmpleados.js
C:\no guardar\nucleo V3\planilla\ui\src\stores\usePlanillas.js
C:\no guardar\nucleo V3\planilla\ui\src\stores\useTareas.js
C:\no guardar\nucleo V3\planilla\ui\src\stores\useUi.js
C:\no guardar\nucleo V3\planilla\ui\src\views\asistencias
C:\no guardar\nucleo V3\planilla\ui\src\views\empleados
C:\no guardar\nucleo V3\planilla\ui\src\views\planillas
C:\no guardar\nucleo V3\planilla\ui\src\views\tareas
C:\no guardar\nucleo V3\planilla\ui\src\views\ChatView.vue
C:\no guardar\nucleo V3\planilla\ui\src\views\NotFound.vue
C:\no guardar\nucleo V3\planilla\ui\src\views\SettingsView.vue
C:\no guardar\nucleo V3\planilla\ui\src\views\asistencias\AsistenciaForm.vue
C:\no guardar\nucleo V3\planilla\ui\src\views\asistencias\AsistenciasIndex.vue
@@ -144,6 +157,7 @@ C:\no guardar\nucleo V3\planilla\worker\cron-worker.js
C:\no guardar\nucleo V3\planilla\worker\Dockerfile
C:\no guardar\nucleo V3\planilla\worker\package-lock.json
C:\no guardar\nucleo V3\planilla\worker\package.json
C:\no guardar\nucleo V3\planilla\worker\sync-empleados.js
C:\no guardar\nucleo V3\planilla\worker\cron\15min
C:\no guardar\nucleo V3\planilla\worker\cron\15min\hello.sh
C:\no guardar\nucleo V3\planilla\worker\prisma\schema.prisma

1273
ui/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,7 @@
import axios from 'axios';
const apiClient = axios.create({
baseURL: 'https://planilla.interno.com', // Using the container name and API port
baseURL: import.meta.env.API_BASE_URL || 'http://localhost:4000',
headers: {
'Content-Type': 'application/json',
},