Changeset 0c48bbb


Ignore:
Timestamp:
07/21/20 12:05:35 (2 years ago)
Author:
Mile Jankuloski <mile.jankuloski@…>
Branches:
master
Children:
333cdac, 92a1f41
Parents:
dba4ca9 (diff), f33b0d4 (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
Updates

Files:
4 added
9 edited

Legend:

Unmodified
Added
Removed
  • Farmatiko/Startup.cs

    rdba4ca9 r0c48bbb  
    11using Microsoft.AspNetCore.Builder;
    22using Microsoft.AspNetCore.Hosting;
    3 using Microsoft.AspNetCore.HttpsPolicy;
    43using Microsoft.AspNetCore.SpaServices.AngularCli;
    54using Microsoft.Extensions.Configuration;
     
    3029            });
    3130            var connectionString = Configuration.GetSection("ConnectionStrings").GetValue<string>("FarmatikoConnection");
    32             services.AddEntityFrameworkNpgsql().AddDbContext<FarmatikoDataContext>(opt => opt.UseNpgsql(connectionString));
     31
     32            services.AddEntityFrameworkNpgsql().AddDbContext<FarmatikoDataContext>(opt => {
     33                opt.UseNpgsql(connectionString);
     34            });
    3335
    3436        }
  • Farmatiko/appsettings.json

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

    rdba4ca9 r0c48bbb  
    33using System.ComponentModel.DataAnnotations;
    44using System.Text;
     5using FarmatikoData.Base;
    56using Microsoft.EntityFrameworkCore;
    67
    78namespace FarmatikoData.Models
    89{
    9     public class HealthFacilities
     10    public class HealthFacilities : BaseEntity
    1011    {
    1112        public HealthFacilities() { }
  • FarmatikoData/Models/HealthcareWorkers.cs

    rdba4ca9 r0c48bbb  
    33using System.ComponentModel.DataAnnotations;
    44using System.Text;
     5using FarmatikoData.Base;
    56using Microsoft.EntityFrameworkCore;
    67
    78namespace FarmatikoData.Models
    89{
    9     public class HealthcareWorkers
     10    public class HealthcareWorkers : BaseEntity
    1011    {
    1112        public HealthcareWorkers() { }
  • FarmatikoData/Models/Medicine.cs

    rdba4ca9 r0c48bbb  
    22using System.Collections.Generic;
    33using System.Text;
     4using FarmatikoData.Base;
    45using Microsoft.EntityFrameworkCore;
    56
    67namespace FarmatikoData.Models
    78{
    8     public class Medicine
     9    public class Medicine : BaseEntity
    910    {
    1011        public Medicine() { }
  • FarmatikoData/Models/MedicineList.cs

    rdba4ca9 r0c48bbb  
    11using System.Collections.Generic;
     2using FarmatikoData.Base;
    23using FarmatikoData.Models;
    34using Microsoft.EntityFrameworkCore;
     
    56namespace FarmatikoData.Models
    67{
    7     public class MedicineList
     8    public class MedicineList : BaseEntity
    89    {
    9         public Medicine Medicines { get; set; }
     10        public Medicine Medicine { get; set; }
    1011        public bool HasMedicine { get; set; }
    1112        public ICollection<Medicine> MedicinesList { get; set; }
  • FarmatikoData/Models/Pandemic.cs

    rdba4ca9 r0c48bbb  
    22using System.Collections.Generic;
    33using System.Text;
     4using FarmatikoData.Base;
    45using Microsoft.EntityFrameworkCore;
    56
    67namespace FarmatikoData.Models
    78{
    8     public class Pandemic
     9    public class Pandemic : BaseEntity
    910    {
    1011        public Pandemic() { }
  • FarmatikoData/Models/Pharmacy.cs

    rdba4ca9 r0c48bbb  
    11using System;
    22using System.Collections.Generic;
     3using System.ComponentModel.DataAnnotations;
    34using System.Text;
     5using FarmatikoData.Base;
    46using Microsoft.EntityFrameworkCore;
    57
    68namespace FarmatikoData.Models
    79{
    8     public class Pharmacy
     10    public class Pharmacy : BaseEntity
    911    {
    1012        public Pharmacy() { }
     13        [Required]
    1114        public string Name { get; set; }
     15        [Required]
    1216        public string Location { get; set; }
     17        [Required]
    1318        public string Address { get; set; }
    1419        public bool WorkAllTime { get; set; }
  • FarmatikoData/Models/PharmacyHead.cs

    rdba4ca9 r0c48bbb  
    22using System.Collections.Generic;
    33using System.Text;
     4using FarmatikoData.Base;
    45using Microsoft.EntityFrameworkCore;
    56
    67namespace FarmatikoData.Models
    78{
    8     public class PharmacyHead
     9    public class PharmacyHead : BaseEntity
    910    {
    1011        public MedicineList PharmacyMedicines { get; set; }
Note: See TracChangeset for help on using the changeset viewer.