Changeset e42f61a for Farmatiko


Ignore:
Timestamp:
07/29/20 13:21:48 (4 years ago)
Author:
DimitarSlezenkovski <dslezenkovski@…>
Branches:
master
Children:
de18858
Parents:
ef1219a
Message:

Add more services

Location:
Farmatiko
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • Farmatiko/ClientApp/package.json

    ref1219a re42f61a  
    44  "scripts": {
    55    "ng": "ng",
    6     "start": "ng serve -o",
     6    "start": "ng serve",
    77    "build": "ng build",
    88    "build:ssr": "ng run Farmatiko:server:dev",

  • Farmatiko/ClientApp/src/app/counter/counter.component.html

    ref1219a re42f61a  
    33
    44<mat-tab-group mat-stretch-tabs>
    5   <mat-tab class="tab" label="Здравствени установи"> 
     5  <mat-tab class="tab" label="Здравствени установи">
    66  <div class="wrapper">
    77    <div class="header">
    … …  
    1616        <td mat-cell *matCellDef="let facilities"> {{facilities.name}} </td>
    1717      </ng-container>
    18  
     18
    1919      <ng-container matColumnDef="Општина">
    2020        <th mat-header-cell *matHeaderCellDef mat-sort-header> Општина </th>
    2121        <td mat-cell *matCellDef="let facilities"> {{facilities.municipality}} </td>
    2222      </ng-container>
    23    
     23
    2424      <ng-container matColumnDef="Адреса">
    2525        <th mat-header-cell *matHeaderCellDef mat-sort-header> Адреса </th>
    2626        <td mat-cell *matCellDef="let facilities"> {{facilities.address}} </td>
    2727      </ng-container>
    28      
     28
    2929      <ng-container matColumnDef="Тип">
    3030        <th mat-header-cell *matHeaderCellDef mat-sort-header> Тип </th>
    3131        <td mat-cell *matCellDef="let facilities"> {{facilities.type}} </td>
    3232      </ng-container>
    33  
     33
    3434      <ng-container matColumnDef="Е-пошта">
    3535        <th mat-header-cell *matHeaderCellDef mat-sort-header> Е-пошта </th>
    3636        <td mat-cell *matCellDef="let facilities"> {{facilities.email}} </td>
    3737      </ng-container>
    38    
     38
    3939      <ng-container matColumnDef="Телефон">
    4040        <th mat-header-cell *matHeaderCellDef mat-sort-header> Телефон </th>
    … …  
    4848  </div>
    4949  </mat-tab>
    50   <mat-tab class="tab" label="Здравствени работници"> 
     50  <mat-tab class="tab" label="Здравствени работници">
    5151  <div class="wrapper">
    5252    <div class="header">
    … …  
    5656    </mat-form-field>
    5757    </div>
    58       <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
     58      <table [dataSource]="dataSourceWorkers" mat-table matSort class="mat-elevation-z8">
    5959        <ng-container matColumnDef="Име">
    6060          <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
    61           <td mat-cell *matCellDef="let facilities"> {{facilities.name}} </td>
     61          <td mat-cell *matCellDef="let workers"> {{workers.name}} </td>
    6262        </ng-container>
    63    
    64         <ng-container matColumnDef="Општина">
    65           <th mat-header-cell *matHeaderCellDef mat-sort-header> Општина </th>
    66           <td mat-cell *matCellDef="let facilities"> {{facilities.municipality}} </td>
     63
     64        <ng-container matColumnDef="Гранка">
     65          <th mat-header-cell *matHeaderCellDef mat-sort-header> Гранка </th>
     66          <td mat-cell *matCellDef="let workers"> {{workers.branch}} </td>
    6767        </ng-container>
    68      
    69         <ng-container matColumnDef="Адреса">
    70           <th mat-header-cell *matHeaderCellDef mat-sort-header> Адреса </th>
    71           <td mat-cell *matCellDef="let facilities"> {{facilities.address}} </td>
     68
     69        <ng-container matColumnDef="Установа">
     70          <th mat-header-cell *matHeaderCellDef mat-sort-header> Установа </th>
     71          <td mat-cell *matCellDef="let workers"> {{workers.facility}} </td>
    7272        </ng-container>
    73        
    74         <ng-container matColumnDef="Тип">
    75           <th mat-header-cell *matHeaderCellDef mat-sort-header> Тип </th>
    76           <td mat-cell *matCellDef="let facilities"> {{facilities.type}} </td>
     73
     74        <ng-container matColumnDef="Назив">
     75          <th mat-header-cell *matHeaderCellDef mat-sort-header> Назив </th>
     76          <td mat-cell *matCellDef="let workers"> {{workers.title}} </td>
    7777        </ng-container>
    78    
    79         <ng-container matColumnDef="Е-пошта">
    80           <th mat-header-cell *matHeaderCellDef mat-sort-header> Е-пошта </th>
    81           <td mat-cell *matCellDef="let facilities"> {{facilities.email}} </td>
    82         </ng-container>
    83      
    84         <ng-container matColumnDef="Телефон">
    85           <th mat-header-cell *matHeaderCellDef mat-sort-header> Телефон </th>
    86           <td mat-cell *matCellDef="let facilities"> {{facilities.phone}} </td>
    87         </ng-container>
    88  
    89           <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
    90           <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
     78
     79
     80
     81          <tr mat-header-row *matHeaderRowDef="displayedColumnsWorkers"></tr>
     82          <tr mat-row *matRowDef="let row; columns: displayedColumnsWorkers;"></tr>
    9183      </table>
    9284      <mat-paginator #paginator [pageSize]="5" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>

  • Farmatiko/ClientApp/src/app/counter/counter.component.ts

    ref1219a re42f61a  
    55import { MatPaginator } from '@angular/material/paginator';
    66import { MatSort } from '@angular/material/sort';
     7import { HealthcareWorkers } from '../models/HealthcareWorkers';
    78
    89@Component({
    … …  
    1314export class CounterComponent implements OnInit {
    1415  public facilities: HealthFacilities[];
     16  public workers: HealthcareWorkers[];
    1517  displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
     18  displayedColumnsWorkers = ['Име','Гранка','Установа', 'Назив'];
    1619  dataSource = new MatTableDataSource<HealthFacilities>();
     20  dataSourceWorkers = new MatTableDataSource<HealthcareWorkers>();
    1721
    1822  @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
    … …  
    2529      this.dataSource = new MatTableDataSource<HealthFacilities>(this.facilities);
    2630    }, error => console.error(error));
     31    http.get<HealthcareWorkers[]>(baseUrl + 'HealthcareWorker/Get?').subscribe(result => {
     32      this.workers = result;
     33      console.log(this.workers);
     34      this.dataSourceWorkers = new MatTableDataSource<HealthcareWorkers>(this.workers);
     35    }, error => console.error(error));
    2736  }
    2837  ngOnInit(): void {
    … …  
    3241    this.dataSource.paginator = this.paginator;
    3342    this.dataSource.sort = this.sort;
     43    this.dataSourceWorkers.paginator = this.paginator;
     44    this.dataSourceWorkers.sort = this.sort;
    3445  }
    3546
    … …  
    3849    filterValue = filterValue.toLowerCase();
    3950    this.dataSource.filter = filterValue;
     51    this.dataSourceWorkers.filter = filterValue;
    4052  }
    4153}

  • Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts

    ref1219a re42f61a  
    55import { MatSort } from '@angular/material/sort';
    66import { HealthFacilities } from '../models/HealthFacilities';
    7 import { HttpClient } from '@angular/common/http';;
     7import { HttpClient } from '@angular/common/http';
    88import { MatDialog } from '@angular/material/dialog';
    99import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';

  • Farmatiko/ClientApp/src/environments/environment.prod.ts

    ref1219a re42f61a  
    11export const environment = {
    2   production: true
     2  production: true,
     3  baseApiUrl: 'htpps://api.farmatiko.com/',
    34};

  • Farmatiko/ClientApp/src/environments/environment.ts

    ref1219a re42f61a  
    44
    55export const environment = {
    6   production: false
     6  production: false,
     7  baseApiUrl: 'https://localhost:44342/',
    78};
    89

  • Farmatiko/ClientApp/src/main.ts

    ref1219a re42f61a  
    66
    77export function getBaseUrl() {
    8   return document.getElementsByTagName('base')[0].href;
     8  return environment.baseApiUrl;
    99}
    1010

  • Farmatiko/ClientApp/tsconfig.json

    ref1219a re42f61a  
    22  "compileOnSave": false,
    33  "compilerOptions": {
    4     "baseUrl": "./",
     4    "baseUrl": "https://localhost:44342/",
    55    "module": "esnext",
    66    "outDir": "./dist/out-tsc",

  • Farmatiko/Controllers/HealthFacilitiesController.cs

    ref1219a re42f61a  
    11using FarmatikoData;
    22using FarmatikoData.Models;
     3using Microsoft.AspNetCore.Cors;
    34using Microsoft.AspNetCore.Mvc;
    45using System.Collections.Generic;
    … …  
    2021            return _healthFacilitiesService.GetAll();
    2122        }
    22         [HttpGet]
    23         public IEnumerable<HealthFacilities> GetByName(string Name)
    24         {
    25             return _healthFacilitiesService.GetByName(Name);
    26         }
    27        
    28         [HttpGet]
    29         public IEnumerable<HealthFacilities> GetByType(string Type)
    30         {
    31             return _healthFacilitiesService.GetByType(Type);
    32         }
    33         [HttpPut]
    34         public void Add(HealthFacilities healthFacility)
    35         {
    36             _healthFacilitiesService.Add(healthFacility);
    37         }
    3823    }
    3924}

  • Farmatiko/Controllers/HealthcareWorkerController.cs

    ref1219a re42f61a  
    1 using Microsoft.AspNetCore.Mvc;
    2 using FarmatikoData.FarmatikoServiceInterfaces;
     1using System;
    32using System.Collections.Generic;
     3using System.Linq;
     4using System.Threading.Tasks;
    45using FarmatikoData.Models;
     6using FarmatikoServices.FarmatikoServiceInterfaces;
     7using Microsoft.AspNetCore.Mvc;
    58
    69namespace Farmatiko.Controllers
    710{
     11    [ApiController]
     12    [Route("[controller]/[action]")]
    813    public class HealthcareWorkerController : Controller
    914    {
    … …  
    1520
    1621        [HttpGet]
    17         public IEnumerable<HealthcareWorkers> GetAll()
     22        public IEnumerable<HealthcareWorkers> Get()
    1823        {
    1924            return _healthcareWorkerService.GetAll();
    2025        }
    21         [HttpGet]
    22         public HealthcareWorkers GetByName(string Name)
    23         {
    24             return _healthcareWorkerService.GetByName(Name);
    25         }
    26         [HttpGet]
    27         public IEnumerable<HealthcareWorkers> GetAllByBranch(string Branch)
    28         {
    29             return _healthcareWorkerService.GetAllByBranch(Branch);
    30         }
    31         [HttpGet]
    32         public IEnumerable<HealthcareWorkers> GetAllByFacility(HealthFacilities Facility)
    33         {
    34             return _healthcareWorkerService.GetAllByFacility(Facility);
    35         }
    36         [HttpGet]
    37         public void Add(HealthcareWorkers HealthcareWorker)
    38         {
    39             _healthcareWorkerService.Add(HealthcareWorker);
    40         }
     26
    4127    }
    4228}

  • Farmatiko/Properties/launchSettings.json

    ref1219a re42f61a  
    1 {
     1{
    22  "iisSettings": {
    33    "windowsAuthentication": false,
    … …  
    1111    "IIS Express": {
    1212      "commandName": "IISExpress",
    13       "launchBrowser": true,
    1413      "environmentVariables": {
    1514        "ASPNETCORE_ENVIRONMENT": "Development"
    … …  
    1918      "commandName": "Project",
    2019      "launchBrowser": true,
    21       "applicationUrl": "https://localhost:5001;http://localhost:5000",
    2220      "environmentVariables": {
    2321        "ASPNETCORE_ENVIRONMENT": "Development"
    24       }
     22      },
     23      "applicationUrl": "https://localhost:5001;http://localhost:5000"
    2524    }
    2625  }

  • Farmatiko/Startup.cs

    ref1219a re42f61a  
    1111using FarmatikoData.FarmatikoRepoInterfaces;
    1212using FarmatikoData.FarmatikoRepo;
     13using FarmatikoServices.FarmatikoServiceInterfaces;
     14using FarmatikoServices.Services;
    1315
    1416namespace Farmatiko
    … …  
    1618    public class Startup
    1719    {
     20        readonly string MyAllowSpecificOrigins = "_myAllowSpecificOrigins";
     21
    1822        public Startup(IConfiguration configuration)
    1923        {
    … …  
    2630        public void ConfigureServices(IServiceCollection services)
    2731        {
     32            services.AddCors(options =>
     33            {
     34                options.AddPolicy(name: MyAllowSpecificOrigins,
     35                                  builder =>
     36                                  {
     37                                      builder.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin();
     38                                  });
     39            });
     40
    2841            services.AddControllersWithViews();
    2942            // In production, the Angular files will be served from this directory
    … …  
    3750            services.AddTransient<IHealthFacilityRepository, HealthFacilityRepository>();
    3851            services.AddTransient<IHealthFacilityService, HealthFacilityService>();
     52            services.AddTransient<IHealthcareWorkerRepository, HealthcareWorkerRepository>();
     53            services.AddTransient<IHealthcareWorkerService, HealthcareWorkerService>();
    3954        }
    4055
    … …  
    6277            app.UseRouting();
    6378
     79            app.UseCors(MyAllowSpecificOrigins);
     80
    6481            app.UseEndpoints(endpoints =>
    6582            {
Note: See TracChangeset for help on using the changeset viewer.