Changeset 92a1f41


Ignore:
Timestamp:
07/21/20 22:17:54 (2 years ago)
Author:
Mile Jankuloski <mile.jankuloski@…>
Branches:
master
Children:
c352b2d
Parents:
0c48bbb
git-author:
Mile Jankuloski <mile.jankuloski@…> (07/21/20 22:15:12)
git-committer:
Mile Jankuloski <mile.jankuloski@…> (07/21/20 22:17:54)
Message:

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

This reverts commit 0c48bbb15c709978f24de20eba18e85b11b413f0, reversing
changes made to dba4ca99892de5ac575b5b732c6926c30f837f5f.

Reverting

Files:
4 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • Farmatiko/Startup.cs

    r0c48bbb r92a1f41  
    11using Microsoft.AspNetCore.Builder;
    22using Microsoft.AspNetCore.Hosting;
     3using Microsoft.AspNetCore.HttpsPolicy;
    34using Microsoft.AspNetCore.SpaServices.AngularCli;
    45using Microsoft.Extensions.Configuration;
     
    2930            });
    3031            var connectionString = Configuration.GetSection("ConnectionStrings").GetValue<string>("FarmatikoConnection");
    31 
    32             services.AddEntityFrameworkNpgsql().AddDbContext<FarmatikoDataContext>(opt => {
    33                 opt.UseNpgsql(connectionString);
    34             });
     32            services.AddEntityFrameworkNpgsql().AddDbContext<FarmatikoDataContext>(opt => opt.UseNpgsql(connectionString));
    3533
    3634        }
  • Farmatiko/appsettings.json

    r0c48bbb r92a1f41  
    11{
    22  "ConnectionStrings": {
    3     "FarmatikoConnection": "Host=localhost;User ID=postgres;Password=@@Postgres@@.;database=FarmatikoDb;Integrated Security=true; Pooling=true;"
     3    "FarmatikoConnection": "User ID=postgres;Password=@@Farmatiko@@.;database=FarmatikoDb;Integrated Security=true; Pooling=true;"
    44  },
    55  "Logging": {
  • FarmatikoData/Models/HealthFacilities.cs

    r0c48bbb r92a1f41  
    33using System.ComponentModel.DataAnnotations;
    44using System.Text;
    5 using FarmatikoData.Base;
    65using Microsoft.EntityFrameworkCore;
    76
    87namespace FarmatikoData.Models
    98{
    10     public class HealthFacilities : BaseEntity
     9    public class HealthFacilities
    1110    {
    1211        public HealthFacilities() { }
  • FarmatikoData/Models/HealthcareWorkers.cs

    r0c48bbb r92a1f41  
    33using System.ComponentModel.DataAnnotations;
    44using System.Text;
    5 using FarmatikoData.Base;
    65using Microsoft.EntityFrameworkCore;
    76
    87namespace FarmatikoData.Models
    98{
    10     public class HealthcareWorkers : BaseEntity
     9    public class HealthcareWorkers
    1110    {
    1211        public HealthcareWorkers() { }
  • FarmatikoData/Models/Medicine.cs

    r0c48bbb r92a1f41  
    22using System.Collections.Generic;
    33using System.Text;
    4 using FarmatikoData.Base;
    54using Microsoft.EntityFrameworkCore;
    65
    76namespace FarmatikoData.Models
    87{
    9     public class Medicine : BaseEntity
     8    public class Medicine
    109    {
    1110        public Medicine() { }
  • FarmatikoData/Models/MedicineList.cs

    r0c48bbb r92a1f41  
    11using System.Collections.Generic;
    2 using FarmatikoData.Base;
    32using FarmatikoData.Models;
    43using Microsoft.EntityFrameworkCore;
     
    65namespace FarmatikoData.Models
    76{
    8     public class MedicineList : BaseEntity
     7    public class MedicineList
    98    {
    10         public Medicine Medicine { get; set; }
     9        public Medicine Medicines { get; set; }
    1110        public bool HasMedicine { get; set; }
    1211        public ICollection<Medicine> MedicinesList { get; set; }
  • FarmatikoData/Models/Pandemic.cs

    r0c48bbb r92a1f41  
    22using System.Collections.Generic;
    33using System.Text;
    4 using FarmatikoData.Base;
    54using Microsoft.EntityFrameworkCore;
    65
    76namespace FarmatikoData.Models
    87{
    9     public class Pandemic : BaseEntity
     8    public class Pandemic
    109    {
    1110        public Pandemic() { }
  • FarmatikoData/Models/Pharmacy.cs

    r0c48bbb r92a1f41  
    11using System;
    22using System.Collections.Generic;
    3 using System.ComponentModel.DataAnnotations;
    43using System.Text;
    5 using FarmatikoData.Base;
    64using Microsoft.EntityFrameworkCore;
    75
    86namespace FarmatikoData.Models
    97{
    10     public class Pharmacy : BaseEntity
     8    public class Pharmacy
    119    {
    1210        public Pharmacy() { }
    13         [Required]
    1411        public string Name { get; set; }
    15         [Required]
    1612        public string Location { get; set; }
    17         [Required]
    1813        public string Address { get; set; }
    1914        public bool WorkAllTime { get; set; }
  • FarmatikoData/Models/PharmacyHead.cs

    r0c48bbb r92a1f41  
    22using System.Collections.Generic;
    33using System.Text;
    4 using FarmatikoData.Base;
    54using Microsoft.EntityFrameworkCore;
    65
    76namespace FarmatikoData.Models
    87{
    9     public class PharmacyHead : BaseEntity
     8    public class PharmacyHead
    109    {
    1110        public MedicineList PharmacyMedicines { get; set; }
Note: See TracChangeset for help on using the changeset viewer.