Ignore:
Timestamp:
08/07/20 11:01:25 (4 years ago)
Author:
Mile Jankuloski <mile.jankuloski@…>
Branches:
master
Children:
5d02859
Parents:
ee137aa (diff), c406ae5 (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

Location:
FarmatikoData/Models
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • FarmatikoData/Models/HealthFacilities.cs

    ree137aa r63d885e  
    2222        public string Email { get; set; }
    2323        public string Phone { get; set; }
     24        public HealthFacilities(string Name, string Municipality, string Address, string Type, string Email, string Phone)
     25        {
     26            this.Name = Name;
     27            this.Municipality = Municipality;
     28            this.Address = Address;
     29            this.Type = Type;
     30            this.Email = Email;
     31            this.Phone = Phone;
     32        }
    2433    }
    2534}
  • FarmatikoData/Models/HealthcareWorkers.cs

    ree137aa r63d885e  
    1818        public HealthFacilities Facility { get; set; }
    1919        public string Title { get; set; }
     20        public HealthcareWorkers(string Name, string Branch, HealthFacilities Facility, string Title)
     21        {
     22            this.Name = Name;
     23            this.Branch = Branch;
     24            this.Facility = Facility;
     25            this.Title = Title;
     26        }
    2027    }
    2128}
  • FarmatikoData/Models/Medicine.cs

    ree137aa r63d885e  
    1313        public float Price { get; set; }
    1414        public string Packaging { get; set; }
     15        public Medicine(string Name, string Strength, string Form, string WayOfIssuing, string Manufacturer, float Price, string Packaging)
     16        {
     17            this.Name = Name;
     18            this.Strength = Strength;
     19            this.Form = Form;
     20            this.WayOfIssuing = WayOfIssuing;
     21            this.Manufacturer = Manufacturer;
     22            this.Price = Price;
     23            this.Packaging = Packaging;
     24        }
    1525
    1626    }
  • FarmatikoData/Models/MedicineList.cs

    ree137aa r63d885e  
    88    public class MedicineList : BaseEntity
    99    {
     10        public MedicineList()
     11        {
     12        }
    1013        public Medicine Medicine { get; set; }
    1114        public bool HasMedicine { get; set; }
     15        public MedicineList(Medicine Medicine, bool HasMedicine)
     16        {
     17            this.Medicine = Medicine;
     18            this.HasMedicine = HasMedicine;
     19        }
    1220        /*public ICollection<MedicineList> MedicinesList { get; set; }
    1321        public MedicineList()
  • FarmatikoData/Models/Pharmacy.cs

    ree137aa r63d885e  
    1414        public string Address { get; set; }
    1515        public bool WorkAllTime { get; set; }
     16        public Pharmacy(string Name, string Location, string Address, bool WorkAllTime)
     17        {
     18            this.Name = Name;
     19            this.Location = Location;
     20            this.Address = Address;
     21            this.WorkAllTime = WorkAllTime;
     22        }
    1623    }
    1724}
Note: See TracChangeset for help on using the changeset viewer.