Changeset a6bbad1


Ignore:
Timestamp:
07/31/20 21:01:19 (4 years ago)
Author:
DimitarSlezenkovski <dslezenkovski@…>
Branches:
master
Children:
c406ae5
Parents:
58fa654 (diff), c73269d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

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

    r58fa654 ra6bbad1  
    1010    <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Пронајди установа">
    1111  </mat-form-field>
    12     </div>
    13     <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
     12    </div>   
     13  <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
     14      <ng-container matColumnDef="id">
     15        <th mat-header-cell *matHeaderCellDef mat-sort-header> id </th>
     16        <td mat-cell *matCellDef="let facilities"> {{facilities.id}} </td>
     17      </ng-container>
     18
     19      <ng-container matColumnDef="createdOn">
     20        <th mat-header-cell *matHeaderCellDef mat-sort-header> createdOn </th>
     21        <td mat-cell *matCellDef="let facilities"> {{facilities.createdOn}} </td>
     22      </ng-container>
     23     
     24      <ng-container matColumnDef="deletedOn">
     25        <th mat-header-cell *matHeaderCellDef mat-sort-header> deletedOn </th>
     26        <td mat-cell *matCellDef="let facilities"> {{facilities.deletedOn}} </td>
     27      </ng-container>
     28
    1429      <ng-container matColumnDef="Име">
    1530        <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
    … …  
    4560        <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
    4661    </table>
    47     <mat-paginator #paginator [pageSize]="5" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
     62    <mat-paginator #paginator [pageSize]="100" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
    4863  </div>
    4964  </mat-tab>

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

    r58fa654 ra6bbad1  
    1 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
     1import { Component, OnInit, ViewChild, Inject, Input } from '@angular/core';
    22import { HttpClient } from '@angular/common/http';
    33import { HealthFacilities } from '../models/HealthFacilities';
    … …  
    1313})
    1414export class CounterComponent implements OnInit {
    15   public facilities: HealthFacilities[];
     15  @Input() facilities: HealthFacilities[];
    1616  public workers: HealthcareWorkers[];
    17   displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
     17  displayedColumns = ['id','createdOn','deletedOn','Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
    1818  displayedColumnsWorkers = ['Име','Гранка','Установа', 'Назив'];
    1919  dataSource = new MatTableDataSource<HealthFacilities>();
    2020  dataSourceWorkers = new MatTableDataSource<HealthcareWorkers>();
    2121
    22   @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
     22  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
    2323  @ViewChild(MatSort) sort: MatSort;
    2424
    … …  
    4141    this.dataSource.paginator = this.paginator;
    4242    this.dataSource.sort = this.sort;
    43     this.dataSourceWorkers.paginator = this.paginator;
    44     this.dataSourceWorkers.sort = this.sort;
    4543  }
    4644

  • Farmatiko/ClientApp/src/app/shared/material.module.ts

    r58fa654 ra6bbad1  
    7575    MatTabsModule,
    7676    MatToolbarModule,
    77     MatTooltipModule
     77    MatTooltipModule,
     78    MatFormFieldModule
    7879  ],
    7980  exports: [
    … …  
    113114    MatTabsModule,
    114115    MatToolbarModule,
    115     MatTooltipModule
     116    MatTooltipModule,
     117    MatFormFieldModule
    116118  ]
    117119})

  • Farmatiko/Controllers/HealthFacilitiesController.cs

    r58fa654 ra6bbad1  
    2020        private IHealthFacilityService _healthFacilitiesService;
    2121        private IProcessJSONService _processJSONService;
    22         /*private IProcessJSONService _processJSONService;*/
    23         private string Path = @"C:\Users\dslez\Desktop\ustanovi.json";
    2422        public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService, IProcessJSONService processJSONService)
    2523        {
    … …  
    3230            return _healthFacilitiesService.GetAll();
    3331        }
    34        /* public void Index()
    35        
     32        public void Index()
    3633        {
    3734            _processJSONService.GetProcessedHealthFacilitiesFromJSON();
    38         }*/
     35        }
    3936    }
    4037}

  • Farmatiko/Farmatiko.csproj

    r58fa654 ra6bbad1  
    3535
    3636  <ItemGroup>
     37    <Compile Remove="Controllers\WeatherForecastController.cs" />
     38    <Compile Remove="WeatherForecast.cs" />
     39  </ItemGroup>
     40
     41  <ItemGroup>
    3742    <ProjectReference Include="..\FarmatikoData\FarmatikoData.csproj" />
    3843    <ProjectReference Include="..\FarmatikoServices\FarmatikoServices.csproj" />

  • FarmatikoServices/Services/ProcessJSONService.cs

    r58fa654 ra6bbad1  
    1515    public class ProcessJSONService : IProcessJSONService
    1616    {
    17         private IHealthFacilityRepository _healthFacilityRepository;
     17        //private IHealthFacilityRepository _healthFacilityRepository;
     18        private IPandemicRepository _pandemicRepository;
     19        //private IHealthcareWorkerRepository _healthcareWorkerRepository;
     20        //private IMedicineRepository _medicineRepository;
    1821        //private readonly ILogger _logger;
    19         public ProcessJSONService(IHealthFacilityRepository healthFacilityRepository)
     22        public ProcessJSONService(/*IHealthFacilityRepository healthFacilityRepository, */IPandemicRepository pandemicRepository/*,
     23            IHealthcareWorkerRepository healthcareWorkerRepository, IMedicineRepository medicineRepository*/)
    2024        {
    2125            //_logger = logger;
    22             _healthFacilityRepository = healthFacilityRepository;
     26            //_healthFacilityRepository = healthFacilityRepository;
     27            _pandemicRepository = pandemicRepository;
     28            //_healthcareWorkerRepository = healthcareWorkerRepository;
     29            //_medicineRepository = medicineRepository;
    2330        }
    2431       
    … …  
    2734            try
    2835            {
    29                 var client = new WebClient();
    30                 var json = client.DownloadString(@"C:\Users\dslez\Desktop\ustanovi.json");
     36                /*var client = new WebClient();
     37                var json = client.DownloadString(@"C:\Users\Miki\Desktop\ustanovi.json");
    3138
    3239                var jsonResponse = JObject.Parse(json);
    3340                var records = JArray.Parse(jsonResponse.GetValue("records").ToString());
    34 
    3541
    3642                foreach(var rec in records)
    … …  
    5056                    healthFacility.Phone = Phone;
    5157                    healthFacility.Type = Type;
    52                     var obje = healthFacility;
    5358                    _healthFacilityRepository.Add(healthFacility);
    5459                   
     60                }*/
     61
     62
     63
     64                var client1 = new RestClient("https://api.covid19api.com/summary");
     65                var response = client1.Execute(new RestRequest());
     66                string original = response.Content;
     67                var jsonResponsePandemic = JObject.Parse(original);
     68                var global = JObject.Parse(jsonResponsePandemic.GetValue("Global").ToString());
     69                var TotalConfirmed = long.Parse(global.GetValue("TotalConfirmed").ToString());
     70                var TotalDeaths = long.Parse(global.GetValue("TotalDeaths").ToString());
     71                var TotalRecovered = long.Parse(global.GetValue("TotalRecovered").ToString());
     72
     73                var mk = JArray.Parse(jsonResponsePandemic.GetValue("Countries").ToString());
     74                dynamic objP = mk[100];
     75                var TotalMk = Int32.Parse(objP.GetValue("TotalConfirmed").ToString());
     76                var TotalDeathsMK = Int32.Parse(objP.GetValue("TotalDeaths").ToString());
     77                var TotalRecoveredMK = Int32.Parse(objP.GetValue("TotalRecovered").ToString());
     78                var NewMK = Int32.Parse(objP.GetValue("NewConfirmed").ToString());
     79
     80                Pandemic pandemic = new Pandemic();
     81                pandemic.TotalGlobal = TotalConfirmed;
     82                pandemic.ActiveGlobal = TotalConfirmed - (TotalRecovered + TotalDeaths);
     83                pandemic.DeathsGlobal = TotalDeaths;
     84                pandemic.TotalMK = TotalMk;
     85                pandemic.ActiveMK = TotalMk - (TotalRecoveredMK + TotalDeathsMK);
     86                pandemic.DeathsMK = TotalDeathsMK;
     87                pandemic.NewMK = NewMK;
     88                pandemic.Name = "Coronavirus";
     89                _pandemicRepository.Add(pandemic);
     90
     91
     92
     93                /*var jsonW = client.DownloadString(@"C:\Users\Miki\Desktop\rabotnici.json");
     94
     95                var jsonResponseW = JObject.Parse(jsonW);
     96                var recordsW = JArray.Parse(jsonResponseW.GetValue("records").ToString());
     97
     98                foreach (var rec in recordsW)
     99                {
     100                    dynamic obj = JsonConvert.DeserializeObject(rec.ToString());
     101                    var Name = obj[4];
     102                    var Branch = obj[2];
     103                    HealthFacilities facility = new HealthFacilities();
     104                    facility.Name = obj[1];
     105                    facility.Municipality = "WorkerFacilityMunicipality";
     106                    facility.Address = "WorkerFacilityAddress";
     107                    var Title = obj[3];
     108                    HealthcareWorkers healthcareWorker = new HealthcareWorkers();
     109                    healthcareWorker.Name = Name;
     110                    healthcareWorker.Branch = Branch;
     111                    healthcareWorker.Facility = facility;
     112                    healthcareWorker.Title = Title;
     113                    _healthcareWorkerRepository.Add(healthcareWorker);
    55114                }
    56115
    57116
    58117
    59                 /*var client1 = new RestClient("https://api.covid19api.com/summary");
    60                 var response = client1.Execute(new RestRequest());
    61                 string original = response.Content;
    62                 var jsonResponse = JObject.Parse(original);
    63                 var global = JObject.Parse(jsonResponse.GetValue("Global").ToString());
    64                 var total = Int32.Parse(global.GetValue("TotalConfirmed").ToString());
    65                 Pandemic pandemic = new Pandemic();
    66                 pandemic.TotalGlobal = total;*/
     118                var jsonM = client.DownloadString(@"C:\Users\Miki\Desktop\lekovi.json");
     119
     120                var jsonResponseM = JObject.Parse(jsonM);
     121                var recordsM = JArray.Parse(jsonResponseM.GetValue("records").ToString());
     122
     123                foreach (var rec in recordsM)
     124                {
     125                    dynamic obj = JsonConvert.DeserializeObject(rec.ToString());
     126                    var Name = obj[1];
     127                    var Strength = obj[7];
     128                    var Form = obj[6];
     129                    var WayOfIssuing = obj[9];
     130                    var Manufacturer = obj[11];
     131                    var Price = float.Parse(obj[17]);
     132                    var Packaging = obj[8];
     133                    Medicine medicine = new Medicine();
     134                    medicine.Name = Name;
     135                    medicine.Strength = Strength;
     136                    medicine.Form = Form;
     137                    medicine.WayOfIssuing = WayOfIssuing;
     138                    medicine.Manufacturer = Manufacturer;
     139                    medicine.Price = Price;
     140                    medicine.Packaging = Packaging;
     141                    _medicineRepository.Add(medicine);
     142                }*/
     143
    67144
    68145            }
Note: See TracChangeset for help on using the changeset viewer.