Merge branch 'master' of https://github.com/imontesinor/vistascita

package.json

@@ -26,30 +26,33 @@
     "@angular/platform-browser-dynamic": "^13.2.6",
     "@angular/router": "^13.2.6",
     "@ng-bootstrap/ng-bootstrap": "12.0.1",
-    "@popperjs/core": "^2.11.4",
     "@ngui/map": "0.30.3",
+    "@popperjs/core": "^2.11.6",
     "@types/googlemaps": "3.39.14",
     "arrive": "2.4.1",
-    "bootstrap": "4.5.2",
+    "bootstrap": "^4.5.2",
     "bootstrap-notify": "3.1.3",
     "chart.js": "2.9.4",
     "chartist": "0.11.4",
     "core-js": "3.21.1",
     "express": "4.18.0",
-    "jquery": "3.5.1",
+    "jquery": "^3.5.1",
     "moment": "2.29.1",
+    "ng2-search-filter": "^0.5.1",
+    "ngx-pagination": "^6.0.2",
     "ngx-toastr": "14.3.0",
     "rxjs": "^7.5.5",
+    "sweetalert2": "^11.4.32",
     "zone.js": "~0.11.5"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^13.2.6",
+    "@angular-devkit/build-angular": "^13.3.9",
     "@angular/cli": "^13.2.6",
     "@angular/compiler-cli": "^13.2.6",
     "@angular/language-service": "13.2.6",
+    "@types/chartist": "0.11.0",
     "@types/jasmine": "~3.10.3",
     "@types/jasminewd2": "~2.0.10",
-    "@types/chartist": "0.11.0",
     "@types/jquery": "3.5.1",
     "@types/node": "16.3.2",
     "codelyzer": "6.0.2",

src/app/app.module.ts

@@ -2,35 +2,64 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { ToastrModule } from "ngx-toastr";
-
 import { SidebarModule } from './sidebar/sidebar.module';
 import { FooterModule } from './shared/footer/footer.module';
 import { NavbarModule} from './shared/navbar/navbar.module';
 import { FixedPluginModule} from './shared/fixedplugin/fixedplugin.module';
-
 import { AppComponent } from './app.component';
 import { AppRoutes } from './app.routing';
-
 import { AdminLayoutComponent } from './layouts/admin-layout/admin-layout.component';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgxPaginationModule } from "ngx-pagination";
+import { FiltercitasPipe } from './pipe/filtercitas.pipe';
+
 
 
 @NgModule({
   declarations: [
     AppComponent,
-    AdminLayoutComponent
+    AdminLayoutComponent,
+    FiltercitasPipe,
+
+
+
+
   ],
   imports: [
-    BrowserAnimationsModule,
+    BrowserAnimationsModule, 
     RouterModule.forRoot(AppRoutes,{
       useHash: true
     }),
+
     SidebarModule,
     NavbarModule,
     ToastrModule.forRoot(),
     FooterModule,
-    FixedPluginModule
+    FixedPluginModule,
+    HttpClientModule,
+    FormsModule,
+
+    ReactiveFormsModule,
+    NgbModule,
+
+    NgxPaginationModule,
+
+
+
+
+  ],
+  exports:[
+    ReactiveFormsModule,
+    FormsModule,
+    FiltercitasPipe,
+
+
   ],
+
   providers: [],
   bootstrap: [AppComponent]
 })
 export class AppModule { }
+

src/app/layouts/admin-layout/admin-layout.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { FormsModule,ReactiveFormsModule} from '@angular/forms';
 
 import { AdminLayoutRoutes } from './admin-layout.routing';
 
@@ -13,15 +13,27 @@ import { IconsComponent }           from '../../pages/icons/icons.component';
 import { MapsComponent }            from '../../pages/maps/maps.component';
 import { NotificationsComponent }   from '../../pages/notifications/notifications.component';
 import { UpgradeComponent }         from '../../pages/upgrade/upgrade.component';
-
+import { PacientesComponent }       from 'app/pages/componentes/pacientes/pacientes.component';
+import { ServiciosComponent }       from 'app/pages/componentes/servicios/servicios.component';
+import { CitasComponent } from 'app/pages/componentes/citas/citas.component';
+import { EstadosComponent } from 'app/pages/componentes/estados/estados.component';
+import { FormularioServiciosComponent } from 'app/pages/componentes/servicios/formulario-servicios/formulario-servicios.component';
+import { FormularioPacientesComponent } from  'app/pages/componentes/pacientes/formulario-pacientes/formulario-pacientes.component';
+import { FormularioCitasComponent}      from 'app/pages/componentes/citas/formulario-citas/formulario-citas.component';
+import { FormularioEstadosComponent } from 'app/pages/componentes/estados/formulario-estados/formulario-estados.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgxPaginationModule } from 'ngx-pagination';
+
+
 
 @NgModule({
   imports: [
     CommonModule,
     RouterModule.forChild(AdminLayoutRoutes),
+    ReactiveFormsModule,
     FormsModule,
-    NgbModule
+
+    NgbModule,NgxPaginationModule
   ],
   declarations: [
     DashboardComponent,
@@ -32,7 +44,16 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     IconsComponent,
     MapsComponent,
     NotificationsComponent,
-  ]
+    PacientesComponent,
+    ServiciosComponent,
+    CitasComponent,
+    EstadosComponent,
+    FormularioServiciosComponent,
+    FormularioPacientesComponent,
+    FormularioCitasComponent,
+   FormularioEstadosComponent
+
+    ]
 })
 
 export class AdminLayoutModule {}

src/app/layouts/admin-layout/admin-layout.routing.ts

@@ -8,6 +8,11 @@ import { IconsComponent } from '../../pages/icons/icons.component';
 import { MapsComponent } from '../../pages/maps/maps.component';
 import { NotificationsComponent } from '../../pages/notifications/notifications.component';
 import { UpgradeComponent } from '../../pages/upgrade/upgrade.component';
+import { PacientesComponent } from 'app/pages/componentes/pacientes/pacientes.component';
+import { Servicios } from 'app/model/servicios';
+import { ServiciosComponent } from 'app/pages/componentes/servicios/servicios.component';
+import { CitasComponent } from 'app/pages/componentes/citas/citas.component';
+import { EstadosComponent } from 'app/pages/componentes/estados/estados.component';
 
 export const AdminLayoutRoutes: Routes = [
     { path: 'dashboard',      component: DashboardComponent },
@@ -17,5 +22,8 @@ export const AdminLayoutRoutes: Routes = [
     { path: 'icons',          component: IconsComponent },
     { path: 'maps',           component: MapsComponent },
     { path: 'notifications',  component: NotificationsComponent },
-    { path: 'upgrade',        component: UpgradeComponent }
+    { path: 'citas/:id',      component: CitasComponent },
+    { path: 'pacientes',      component: PacientesComponent },
+    { path: 'servicios',      component: ServiciosComponent},
+    { path: 'estados',        component:EstadosComponent}
 ];

src/app/model/citas.ts

@@ -0,0 +1,16 @@
+import { Estados } from "./estados";
+import { Pacientes } from "./pacientes";
+import { Servicios } from "./servicios";
+
+export class Citas  {
+
+  id:number;
+  fecha:Date;
+  paciente:Pacientes;
+  servicios:Servicios[];
+  servi:Servicios;
+  estado:Estados;
+
+
+
+}

src/app/model/estados.ts

@@ -0,0 +1,7 @@
+
+
+export class Estados{
+    id:number;
+    nombre:String;
+
+}

src/app/model/pacientes.ts

@@ -0,0 +1,13 @@
+import { Usuarios } from "./usuarios";
+
+export class Pacientes {
+  usuarios:Usuarios = new Usuarios;
+  id: number;
+  cedula: String;
+  nombre: String;
+  apellidos: String;
+  direccion: String;
+  telefono: String;
+  entidad: String;
+  paciente:Pacientes;
+  }

src/app/model/servicios.ts

@@ -0,0 +1,6 @@
+export class Servicios {
+  eid:number;
+  nombre:String;
+servicio:Servicios;
+
+}

src/app/model/usuarios.ts

@@ -0,0 +1,9 @@
+export class Usuarios {
+  uid: number;
+  nombres: String;
+  apellidos: String;
+  cedula: String;
+  estado: String;
+  nusuario: String;
+  passwd: String;
+}

src/app/pages/componentes/citas/citas.component.html

@@ -0,0 +1,80 @@
+<div class="row">
+  <div class="col-md-6">
+    <div class="card">
+      <div class="card-header">
+        <h4 class="card-title"> Pacientes</h4>
+        <!--<input #inputstring (keyup)="capturarString(inputstring.value)" type="text" class="form-control" placeholder="Entidad"/>-->
+      </div>
+      <div class="card-body">
+        <div class="table-responsive">
+
+
+          <table   class="table">
+
+
+           <thead class=" text-primary"> 
+
+
+
+
+              <th>id</th>
+
+              <th>
+                Cedula
+              </th>
+              <th>
+               Nombres y Apellidos
+
+              </th>
+
+               <th>
+                Entidad
+              </th>
+            </thead>
+            <tbody>
+
+              <td >{{idPaciente}}</td>
+                <td >{{paciente?.paciente?.cedula}}</td>
+                <td >{{paciente?.paciente?.nombre}} {{paciente?.paciente?.apellidos}}</td>
+                <td >{{paciente?.paciente?.entidad}}</td>
+
+
+
+
+                          </tbody>
+
+              <thead class=" text-primary"> 
+                <tr><td>
+                  <input type="text"  [(ngModel)]="query" placeholder="Search...."></td>
+
+                <td>
+              <button (click)="listarFiltro()"  class="btn btn-primary btn-round">FILTRAR</button></td>
+            </tr> 
+              <th>Estado</th>
+              <th>fecha</th>
+              <th>nombres</th>
+              <th>Numero Identificacion</th>
+              <th>servicios</th>
+            </thead>
+                <tbody>
+
+
+                  <tr *ngFor="let c of citas  | paginate: {itemsPerPage: tamano,currentPage:p,totalItems:total}">
+
+                    <td>{{c.estado?.nombre }}</td>
+                  <td>{{c?.fecha | date:"yyyy-MM-dd"}}  </td>
+                <td>{{c.paciente?.nombre }} {{paciente?.apellidos}}</td>
+                 <td>{{c.paciente?.cedula}}</td>
+                  <td>{{c.servicio?.nombre}}</td>
+                  <button (click)="seleccionCita(c)" class="btn btn-primary btn-round">Seleccionar</button>
+
+                </tr>
+                </tbody>
+                          </table>
+                          <pagination-controls previousLabel="Anterior"  nextLabel="Siguiente" (pageChange)="p=$event; listarCitas();"></pagination-controls>
+                        </div></div></div></div>              
+  <div class="col-md-14">
+    <div>
+        <app-formulario-citas (propagarCita)=" listarCitas()"  [citarecibo]="cita"></app-formulario-citas>
+      </div></div>
+