Changes in / [a6bbad1:58fa654]

Files:

• Farmatiko/.config/dotnet-tools.json (deleted)
• Farmatiko/ClientApp/src/app/counter/counter.component.html (modified) (2 diffs)
• Farmatiko/ClientApp/src/app/counter/counter.component.ts (modified) (3 diffs)
• Farmatiko/ClientApp/src/app/shared/material.module.ts (modified) (2 diffs)
• Farmatiko/Controllers/HealthFacilitiesController.cs (modified) (2 diffs)
• Farmatiko/Farmatiko.csproj (modified) (1 diff)
• FarmatikoServices/Services/ProcessJSONService.cs (modified) (3 diffs)

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

@@ -10 +10 @@
     <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Пронајди установа">
   </mat-form-field>
-    </div>    
-  <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
-      <ng-container matColumnDef="id">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> id </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.id}} </td>
-      </ng-container>
-
-      <ng-container matColumnDef="createdOn">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> createdOn </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.createdOn}} </td>
-      </ng-container>
-      
-      <ng-container matColumnDef="deletedOn">
-        <th mat-header-cell *matHeaderCellDef mat-sort-header> deletedOn </th>
-        <td mat-cell *matCellDef="let facilities"> {{facilities.deletedOn}} </td>
-      </ng-container>
-
+    </div>
+    <table [dataSource]="dataSource" mat-table matSort class="mat-elevation-z8">
       <ng-container matColumnDef="Име">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Име </th>
@@ -60 +45 @@
         <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
     </table>
-    <mat-paginator #paginator [pageSize]="100" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
+    <mat-paginator #paginator [pageSize]="5" [pageSizeOptions]="[5, 10, 20, 100]"></mat-paginator>
   </div>
   </mat-tab>

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

@@ -1 @@
-import { Component, OnInit, ViewChild, Inject, Input } from '@angular/core';
+import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { HealthFacilities } from '../models/HealthFacilities';
@@ -13 +13 @@
 })
 export class CounterComponent implements OnInit {
-  @Input() facilities: HealthFacilities[];
+  public facilities: HealthFacilities[];
   public workers: HealthcareWorkers[];
-  displayedColumns = ['id','createdOn','deletedOn','Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
+  displayedColumns = ['Име','Општина','Адреса', 'Тип', 'Е-пошта', 'Телефон'];
   displayedColumnsWorkers = ['Име','Гранка','Установа', 'Назив'];
   dataSource = new MatTableDataSource<HealthFacilities>();
   dataSourceWorkers = new MatTableDataSource<HealthcareWorkers>();
 
-  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
+  @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
@@ -41 +41 @@
     this.dataSource.paginator = this.paginator;
     this.dataSource.sort = this.sort;
+    this.dataSourceWorkers.paginator = this.paginator;
+    this.dataSourceWorkers.sort = this.sort;
   }
 

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

@@ -75 +75 @@
     MatTabsModule,
     MatToolbarModule,
-    MatTooltipModule,
-    MatFormFieldModule
+    MatTooltipModule
   ],
   exports: [
@@ -114 +113 @@
     MatTabsModule,
     MatToolbarModule,
-    MatTooltipModule,
-    MatFormFieldModule
+    MatTooltipModule
   ]
 })

Farmatiko/Controllers/HealthFacilitiesController.cs

@@ -20 +20 @@
         private IHealthFacilityService _healthFacilitiesService;
         private IProcessJSONService _processJSONService;
+        /*private IProcessJSONService _processJSONService;*/
+        private string Path = @"C:\Users\dslez\Desktop\ustanovi.json";
         public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService, IProcessJSONService processJSONService)
         {
@@ -30 +32 @@
             return _healthFacilitiesService.GetAll();
         }
-        public void Index()
+       /* public void Index()
+        
         {
             _processJSONService.GetProcessedHealthFacilitiesFromJSON();
-        }
+        }*/
     }
 }

Farmatiko/Farmatiko.csproj

@@ -35 +35 @@
 
   <ItemGroup>
-    <Compile Remove="Controllers\WeatherForecastController.cs" />
-    <Compile Remove="WeatherForecast.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
     <ProjectReference Include="..\FarmatikoData\FarmatikoData.csproj" />
     <ProjectReference Include="..\FarmatikoServices\FarmatikoServices.csproj" />

FarmatikoServices/Services/ProcessJSONService.cs

@@ -15 +15 @@
     public class ProcessJSONService : IProcessJSONService
     {
-        //private IHealthFacilityRepository _healthFacilityRepository;
-        private IPandemicRepository _pandemicRepository;
-        //private IHealthcareWorkerRepository _healthcareWorkerRepository;
-        //private IMedicineRepository _medicineRepository;
+        private IHealthFacilityRepository _healthFacilityRepository;
         //private readonly ILogger _logger;
-        public ProcessJSONService(/*IHealthFacilityRepository healthFacilityRepository, */IPandemicRepository pandemicRepository/*,
-            IHealthcareWorkerRepository healthcareWorkerRepository, IMedicineRepository medicineRepository*/)
+        public ProcessJSONService(IHealthFacilityRepository healthFacilityRepository)
         {
             //_logger = logger;
-            //_healthFacilityRepository = healthFacilityRepository;
-            _pandemicRepository = pandemicRepository;
-            //_healthcareWorkerRepository = healthcareWorkerRepository;
-            //_medicineRepository = medicineRepository;
+            _healthFacilityRepository = healthFacilityRepository;
         }
         
@@ -34 +27 @@
             try
             {
-                /*var client = new WebClient();
-                var json = client.DownloadString(@"C:\Users\Miki\Desktop\ustanovi.json");
+                var client = new WebClient();
+                var json = client.DownloadString(@"C:\Users\dslez\Desktop\ustanovi.json");
 
                 var jsonResponse = JObject.Parse(json);
                 var records = JArray.Parse(jsonResponse.GetValue("records").ToString());
+
 
                 foreach(var rec in records)
@@ -56 +50 @@
                     healthFacility.Phone = Phone;
                     healthFacility.Type = Type;
+                    var obje = healthFacility;
                     _healthFacilityRepository.Add(healthFacility);
                     
-                }*/
-
-
-
-                var client1 = new RestClient("https://api.covid19api.com/summary");
-                var response = client1.Execute(new RestRequest());
-                string original = response.Content;
-                var jsonResponsePandemic = JObject.Parse(original);
-                var global = JObject.Parse(jsonResponsePandemic.GetValue("Global").ToString());
-                var TotalConfirmed = long.Parse(global.GetValue("TotalConfirmed").ToString());
-                var TotalDeaths = long.Parse(global.GetValue("TotalDeaths").ToString());
-                var TotalRecovered = long.Parse(global.GetValue("TotalRecovered").ToString());
-
-                var mk = JArray.Parse(jsonResponsePandemic.GetValue("Countries").ToString());
-                dynamic objP = mk[100];
-                var TotalMk = Int32.Parse(objP.GetValue("TotalConfirmed").ToString());
-                var TotalDeathsMK = Int32.Parse(objP.GetValue("TotalDeaths").ToString());
-                var TotalRecoveredMK = Int32.Parse(objP.GetValue("TotalRecovered").ToString());
-                var NewMK = Int32.Parse(objP.GetValue("NewConfirmed").ToString());
-
-                Pandemic pandemic = new Pandemic();
-                pandemic.TotalGlobal = TotalConfirmed;
-                pandemic.ActiveGlobal = TotalConfirmed - (TotalRecovered + TotalDeaths);
-                pandemic.DeathsGlobal = TotalDeaths;
-                pandemic.TotalMK = TotalMk;
-                pandemic.ActiveMK = TotalMk - (TotalRecoveredMK + TotalDeathsMK);
-                pandemic.DeathsMK = TotalDeathsMK;
-                pandemic.NewMK = NewMK;
-                pandemic.Name = "Coronavirus";
-                _pandemicRepository.Add(pandemic);
-
-
-
-                /*var jsonW = client.DownloadString(@"C:\Users\Miki\Desktop\rabotnici.json");
-
-                var jsonResponseW = JObject.Parse(jsonW);
-                var recordsW = JArray.Parse(jsonResponseW.GetValue("records").ToString());
-
-                foreach (var rec in recordsW)
-                {
-                    dynamic obj = JsonConvert.DeserializeObject(rec.ToString());
-                    var Name = obj[4];
-                    var Branch = obj[2];
-                    HealthFacilities facility = new HealthFacilities();
-                    facility.Name = obj[1];
-                    facility.Municipality = "WorkerFacilityMunicipality";
-                    facility.Address = "WorkerFacilityAddress";
-                    var Title = obj[3];
-                    HealthcareWorkers healthcareWorker = new HealthcareWorkers();
-                    healthcareWorker.Name = Name;
-                    healthcareWorker.Branch = Branch;
-                    healthcareWorker.Facility = facility;
-                    healthcareWorker.Title = Title;
-                    _healthcareWorkerRepository.Add(healthcareWorker);
                 }
 
 
 
-                var jsonM = client.DownloadString(@"C:\Users\Miki\Desktop\lekovi.json");
-
-                var jsonResponseM = JObject.Parse(jsonM);
-                var recordsM = JArray.Parse(jsonResponseM.GetValue("records").ToString());
-
-                foreach (var rec in recordsM)
-                {
-                    dynamic obj = JsonConvert.DeserializeObject(rec.ToString());
-                    var Name = obj[1];
-                    var Strength = obj[7];
-                    var Form = obj[6];
-                    var WayOfIssuing = obj[9];
-                    var Manufacturer = obj[11];
-                    var Price = float.Parse(obj[17]);
-                    var Packaging = obj[8];
-                    Medicine medicine = new Medicine();
-                    medicine.Name = Name;
-                    medicine.Strength = Strength;
-                    medicine.Form = Form;
-                    medicine.WayOfIssuing = WayOfIssuing;
-                    medicine.Manufacturer = Manufacturer;
-                    medicine.Price = Price;
-                    medicine.Packaging = Packaging;
-                    _medicineRepository.Add(medicine);
-                }*/
-
+                /*var client1 = new RestClient("https://api.covid19api.com/summary");
+                var response = client1.Execute(new RestRequest());
+                string original = response.Content;
+                var jsonResponse = JObject.Parse(original);
+                var global = JObject.Parse(jsonResponse.GetValue("Global").ToString());
+                var total = Int32.Parse(global.GetValue("TotalConfirmed").ToString());
+                Pandemic pandemic = new Pandemic();
+                pandemic.TotalGlobal = total;*/
 
             }