Resolved Merge Conflict
This commit is contained in:
20
dotnet/AlfaPrentice/Models/Adres.cs
Normal file
20
dotnet/AlfaPrentice/Models/Adres.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Adres
|
||||
{
|
||||
[Key]
|
||||
public int Adres_ID { get; set; }
|
||||
public string Straat { get; set; }
|
||||
public int Huisnummer { get; set; }
|
||||
public string Toevoeging { get; set; }
|
||||
public string Postcode { get; set; }
|
||||
public string Plaats { get; set; }
|
||||
public string Land { get; set; }
|
||||
}
|
||||
}
|
||||
24
dotnet/AlfaPrentice/Models/Afspraak.cs
Normal file
24
dotnet/AlfaPrentice/Models/Afspraak.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Afspraak
|
||||
{
|
||||
[Key]
|
||||
public int Afspraak_ID { get; set; }
|
||||
public int Agenda_ID { get; set; }
|
||||
public DateTime BeginDatumeTijd { get; set; }
|
||||
public int EindDaatumTijd { get; set; }
|
||||
public string Locatie { get; set; }
|
||||
public string Omschrijving { get; set; }
|
||||
public string Onderwerp { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
public int Docent_ID { get; set; }
|
||||
public int Student_ID { get; set; }
|
||||
public int Praktijkbegeleider_ID { get; set; }
|
||||
}
|
||||
}
|
||||
16
dotnet/AlfaPrentice/Models/Agenda.cs
Normal file
16
dotnet/AlfaPrentice/Models/Agenda.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Agenda
|
||||
{
|
||||
[Key]
|
||||
public int Agenda_ID { get; set; }
|
||||
public int AgendaBlock_ID { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
}
|
||||
}
|
||||
18
dotnet/AlfaPrentice/Models/AgendaBlok.cs
Normal file
18
dotnet/AlfaPrentice/Models/AgendaBlok.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class AgendaBlok
|
||||
{
|
||||
[Key]
|
||||
public int AgendaBlok_ID { get; set; }
|
||||
public DateTime BeginDatumTijd { get; set; }
|
||||
public DateTime EindDatumTijd { get; set; }
|
||||
public int Agenda_ID { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
}
|
||||
}
|
||||
14
dotnet/AlfaPrentice/Models/AppSettings.cs
Normal file
14
dotnet/AlfaPrentice/Models/AppSettings.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class AppSettings
|
||||
{
|
||||
public string EmailSmtp { get; set; }
|
||||
public string EmailUsername { get; set; }
|
||||
public string EmailPassword { get; set; }
|
||||
}
|
||||
}
|
||||
17
dotnet/AlfaPrentice/Models/BPVDocent.cs
Normal file
17
dotnet/AlfaPrentice/Models/BPVDocent.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class BPVDocent
|
||||
{
|
||||
[Key]
|
||||
public int BPVdocent_ID { get; set; }
|
||||
public int Docent_ID { get; set; }
|
||||
public int Student_ID { get; set; }
|
||||
public int Traject_ID { get; set; }
|
||||
}
|
||||
}
|
||||
22
dotnet/AlfaPrentice/Models/Bedrijf.cs
Normal file
22
dotnet/AlfaPrentice/Models/Bedrijf.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Bedrijf
|
||||
{
|
||||
[Key]
|
||||
public int Bedrijf_ID { get; set; }
|
||||
public string Naam { get; set; }
|
||||
public string Logo { get; set; }
|
||||
public string Beschrijving { get; set; }
|
||||
public string Email { get; set; }
|
||||
public int Telefoon { get; set; }
|
||||
public string Status { get; set; }
|
||||
public int Adres_ID { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
20
dotnet/AlfaPrentice/Models/Bericht.cs
Normal file
20
dotnet/AlfaPrentice/Models/Bericht.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Bericht
|
||||
{
|
||||
[Key]
|
||||
public int Bericht_ID { get; set; }
|
||||
public string Onderwerp { get; set; }
|
||||
public string Berichtt { get; set; }
|
||||
public DateTime BerichtDatumTijd { get; set; }
|
||||
public int Afzender { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
}
|
||||
}
|
||||
19
dotnet/AlfaPrentice/Models/Deelnemer.cs
Normal file
19
dotnet/AlfaPrentice/Models/Deelnemer.cs
Normal file
@@ -0,0 +1,19 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Deelnemer
|
||||
{
|
||||
[Key]
|
||||
public int Deelnemer_ID { get; set; }
|
||||
public int Afspraak_ID { get; set; }
|
||||
public int Student_ID { get; st; }
|
||||
public int BPVdocent_ID { get; set; }
|
||||
public int Docent_ID { get; set; }
|
||||
public int Praktijkbegeleider_ID { get; set; }
|
||||
}
|
||||
}
|
||||
16
dotnet/AlfaPrentice/Models/Docent.cs
Normal file
16
dotnet/AlfaPrentice/Models/Docent.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Docent : Gebruiker
|
||||
{
|
||||
[Key]
|
||||
public int Docent_ID { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
public string DrieLetterCode { get; set; }
|
||||
}
|
||||
}
|
||||
18
dotnet/AlfaPrentice/Models/Document.cs
Normal file
18
dotnet/AlfaPrentice/Models/Document.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Document
|
||||
{
|
||||
[Key]
|
||||
public int Document_ID { get; set; }
|
||||
public string Bestand { get; set; }
|
||||
public DateTime UploadDatumTijd { get; set; }
|
||||
public int Versie { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
}
|
||||
}
|
||||
15
dotnet/AlfaPrentice/Models/Eisen.cs
Normal file
15
dotnet/AlfaPrentice/Models/Eisen.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Eisen
|
||||
{
|
||||
[Key]
|
||||
public int Eisen_ID { get; set; }
|
||||
public string Omschrijving { get; set; }
|
||||
}
|
||||
}
|
||||
21
dotnet/AlfaPrentice/Models/Evaluatie.cs
Normal file
21
dotnet/AlfaPrentice/Models/Evaluatie.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Evaluatie
|
||||
{
|
||||
[Key]
|
||||
public int Evaluatie_ID { get; set; }
|
||||
public string Beoordeling { get; set; }
|
||||
public string Feedbakc { get; set; }
|
||||
public int Student_ID { get; set; }
|
||||
public int BPVdocent_ID { get; set; }
|
||||
public int Praktijkbegeleider_ID { get; set; }
|
||||
public int EvaluatieDatumTIjd { get; set; }
|
||||
public bool Accodering { get; set; }
|
||||
}
|
||||
}
|
||||
25
dotnet/AlfaPrentice/Models/Gebruiker.cs
Normal file
25
dotnet/AlfaPrentice/Models/Gebruiker.cs
Normal file
@@ -0,0 +1,25 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Gebruiker
|
||||
{
|
||||
[Key]
|
||||
public int Gebruiker_ID { get; set; }
|
||||
public string Voornaam { get; set; }
|
||||
public string Tussenvoegsel { get; set; }
|
||||
public string Achternaam { get; set; }
|
||||
public DateTime GeboorteDatum { get; set; }
|
||||
public string Geslacht { get; set; }
|
||||
public string Email { get; set; }
|
||||
public int Telefoon { get; set; }
|
||||
public string Wachtwoord { get; set; }
|
||||
public string Profielfoto { get; set; }
|
||||
public string Status { get; set; }
|
||||
public int Adres_ID { get; set; }
|
||||
}
|
||||
}
|
||||
17
dotnet/AlfaPrentice/Models/Klas.cs
Normal file
17
dotnet/AlfaPrentice/Models/Klas.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Klas
|
||||
{
|
||||
[Key]
|
||||
public int Klas_ID { get; set; }
|
||||
public string Klasnaam { get; set; }
|
||||
public int Mentor_ID { get; set; }
|
||||
public int Opeleiding { get; set; }
|
||||
}
|
||||
}
|
||||
15
dotnet/AlfaPrentice/Models/Mentor.cs
Normal file
15
dotnet/AlfaPrentice/Models/Mentor.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Mentor
|
||||
{
|
||||
[Key]
|
||||
public int Mentor_ID { get; set; }
|
||||
public int Docent_ID { get; set; }
|
||||
}
|
||||
}
|
||||
17
dotnet/AlfaPrentice/Models/Opleiding.cs
Normal file
17
dotnet/AlfaPrentice/Models/Opleiding.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Opleiding
|
||||
{
|
||||
[Key]
|
||||
public int Opleiding_ID { get; set; }
|
||||
public string Naam { get; set; }
|
||||
public string Omschrijving { get; set; }
|
||||
public string Status { get; set; }
|
||||
}
|
||||
}
|
||||
20
dotnet/AlfaPrentice/Models/POK.cs
Normal file
20
dotnet/AlfaPrentice/Models/POK.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class POK
|
||||
{
|
||||
[Key]
|
||||
public int POK_ID { get; set; }
|
||||
public bool Accodering { get; set; }
|
||||
public DateTime AccoderingDatum { get; set; }
|
||||
public DateTime AnnmaakDatum { get; set; }
|
||||
public int Student_ID { get; set; }
|
||||
public int BPVdocent_ID { get; set; }
|
||||
public int Praktijkbegeleider_ID { get; set; }
|
||||
}
|
||||
}
|
||||
18
dotnet/AlfaPrentice/Models/Praktijkbegeleider.cs
Normal file
18
dotnet/AlfaPrentice/Models/Praktijkbegeleider.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Praktijkbegeleider : Gebruiker
|
||||
{
|
||||
[Key]
|
||||
|
||||
public int Praktijkbegeleider_ID { get; set; }
|
||||
public string Functie { get; set; }
|
||||
public int Bedrijf_ID { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
}
|
||||
}
|
||||
17
dotnet/AlfaPrentice/Models/Session.cs
Normal file
17
dotnet/AlfaPrentice/Models/Session.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Session
|
||||
{
|
||||
[Key]
|
||||
public int Session_ID { get; set; }
|
||||
public string SessionToken { get; set; }
|
||||
public DateTime SessionVervalDatumTijd { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
}
|
||||
}
|
||||
18
dotnet/AlfaPrentice/Models/Sollicitatie.cs
Normal file
18
dotnet/AlfaPrentice/Models/Sollicitatie.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Sollicitatie
|
||||
{
|
||||
[Key]
|
||||
public int Sollicitatie_ID { get; set; }
|
||||
public DateTime SolicitaieDatum { get; set; }
|
||||
public string Status { get; set; }
|
||||
public int Bedrijf_ID { get; set; }
|
||||
public int Student_ID { get; set; }
|
||||
}
|
||||
}
|
||||
18
dotnet/AlfaPrentice/Models/StagePlek.cs
Normal file
18
dotnet/AlfaPrentice/Models/StagePlek.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Stageplek
|
||||
{
|
||||
[Key]
|
||||
public int StagePlek_ID { get; set; }
|
||||
public int AantalPlekken { get; set; }
|
||||
public int Bedrijf_ID { get; set; }
|
||||
public int Eisen_ID { get; set; }
|
||||
public int Opleiding_ID { get; set; }
|
||||
}
|
||||
}
|
||||
14
dotnet/AlfaPrentice/Models/Stagecoordinator.cs
Normal file
14
dotnet/AlfaPrentice/Models/Stagecoordinator.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Stagecoordinator
|
||||
{
|
||||
[Key]
|
||||
public int StageCoördinator_ID { get; set; }
|
||||
}
|
||||
}
|
||||
23
dotnet/AlfaPrentice/Models/Student.cs
Normal file
23
dotnet/AlfaPrentice/Models/Student.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Student : Gebruiker
|
||||
{
|
||||
[Key]
|
||||
public int Student_ID { get; set; }
|
||||
public DateTime BeginDatum { get; set; }
|
||||
public int Leerjaar { get; set; }
|
||||
public int Adres_ID { get; set; }
|
||||
public string CV { get; set; }
|
||||
public string Motivatiebrief { get; set; }
|
||||
public string Programmeertalen { get; set; }
|
||||
public string Weblinks { get; set; }
|
||||
public int Gebruiker_ID { get; set; }
|
||||
public int Klas_ID { get; set; }
|
||||
}
|
||||
}
|
||||
25
dotnet/AlfaPrentice/Models/Traject.cs
Normal file
25
dotnet/AlfaPrentice/Models/Traject.cs
Normal file
@@ -0,0 +1,25 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Traject
|
||||
{
|
||||
[Key]
|
||||
public int Traject_ID { get; set; }
|
||||
public int Student_ID { get; set; }
|
||||
public int BPVdocent_ID { get; set; }
|
||||
public int Praktijkbegelijder_ID { get; set; }
|
||||
public DateTime BeginDatum { get; set; }
|
||||
public DateTime EindDatum { get; set; }
|
||||
public int Evaluatie_ID { get; set; }
|
||||
public int Weekstaten_ID { get; set; }
|
||||
public int POK_ID { get; set; }
|
||||
public int Sollicitatie_ID { get; set; }
|
||||
public int StageCoördinator_ID { get; set; }
|
||||
public int Document_ID { get; set; }
|
||||
}
|
||||
}
|
||||
20
dotnet/AlfaPrentice/Models/Weekstaten.cs
Normal file
20
dotnet/AlfaPrentice/Models/Weekstaten.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AlfaPrentice.Models
|
||||
{
|
||||
public class Weekstaten
|
||||
{
|
||||
[Key]
|
||||
public int Weekstaten_ID { get; set; }
|
||||
public string Beschrijving { get; set; }
|
||||
public DateTime BeginDatumTijd { get; set; }
|
||||
public DateTime EindDatumTijd { get; set; }
|
||||
public int Student_ID { get; set; }
|
||||
public string Status { get; set; }
|
||||
public int GewerkteUren { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user