Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
280abd5
Meni commit
meni3a Dec 26, 2019
a1a867d
commit 2
meni3a Dec 30, 2019
d4e99f4
Merge pull request #1 from ipewzner/dev
meni3a Dec 31, 2019
591da85
2.2 meni
meni3a Feb 2, 2020
f4b63a6
Merge branch '0.7' into 0.9
meni3a Feb 2, 2020
0eb0987
2.2 new meni
meni3a Feb 2, 2020
e8e4302
fix some things
meni3a Feb 2, 2020
b3099a8
3
ipewzner Feb 3, 2020
b477356
3.1
ipewzner Feb 3, 2020
435776d
meni commit
meni3a Feb 3, 2020
d97c4d0
2.2
ipewzner Feb 6, 2020
4e1e4d6
2.3
ipewzner Feb 7, 2020
47be922
3
ipewzner Feb 8, 2020
1f64143
meni new commit
meni3a Feb 9, 2020
3186795
Merge branch '0.9' of https://github.com/ipewzner/Mini_project_Window…
meni3a Feb 9, 2020
e44bcfb
111
meni3a Feb 9, 2020
3e8fb83
222
meni3a Feb 9, 2020
7084c8f
444
meni3a Feb 9, 2020
be038fe
75
meni3a Feb 9, 2020
2f1bf60
new ommit meni
meni3a Feb 9, 2020
9b37a2a
Meni commit 20:30
meni3a Feb 9, 2020
795fffc
final commit of today
meni3a Feb 9, 2020
82599fd
3
ipewzner Feb 9, 2020
b646dc4
Merge branch '0.9' of https://github.com/ipewzner/Mini_project_Window…
ipewzner Feb 9, 2020
a5a9e68
4
ipewzner Feb 10, 2020
4137c59
4.1
ipewzner Feb 12, 2020
b24f38d
677
meni3a Feb 12, 2020
fd6ce0a
4.2
ipewzner Feb 12, 2020
254524b
Merge branch '0.9' of https://github.com/ipewzner/Mini_project_Window…
ipewzner Feb 12, 2020
aac0d55
meni final commit
meni3a Feb 12, 2020
e4f9872
4.3
ipewzner Feb 12, 2020
b1566c9
Merge branch '0.9' of https://github.com/ipewzner/Mini_project_Window…
ipewzner Feb 12, 2020
543bfcf
4
ipewzner Feb 13, 2020
691cb18
14:12
meni3a Feb 13, 2020
768d725
5
ipewzner Feb 13, 2020
fccd111
5.2
ipewzner Feb 14, 2020
100be79
5.3
ipewzner Feb 14, 2020
0992238
0230
meni3a Feb 14, 2020
63dfc99
Merge branch '0.9' of https://github.com/ipewzner/Mini_project_Window…
meni3a Feb 14, 2020
5f82066
meni fix order
meni3a Feb 15, 2020
852e7f9
meni final commit
meni3a Feb 16, 2020
fd97dff
Validtion
ipewzner Feb 16, 2020
f4c01ec
Merge branch '0.9' of https://github.com/ipewzner/Mini_project_Window…
ipewzner Feb 16, 2020
f93fb02
avlid all
ipewzner Feb 16, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 190 additions & 0 deletions BE/ATM.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BE
{

// NOTE: Generated code may require at least .NET Framework 4.5 or .NET Core/Standard 2.0.
/// <remarks/>
[System.SerializableAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)]
[System.Xml.Serialization.XmlRootAttribute(Namespace = "", IsNullable = false)]
public partial class ATM
{

private string קוד_בנקField;

private string שם_בנקField;

private string קוד_סניףField;

private string כתובת_הATMField;

private string ישובField;

private string עמלהField;

private string סוג_ATMField;

private string מיקום_הATM_ביחס_לסניףField;

private string גישה_לנכיםField;

private string קואורדינטת_XField;

private string קואורדינטת_YField;

/// <remarks/>
public string קוד_בנק
{
get
{
return this.קוד_בנקField;
}
set
{
this.קוד_בנקField = value;
}
}

/// <remarks/>
public string שם_בנק
{
get
{
return this.שם_בנקField;
}
set
{
this.שם_בנקField = value;
}
}

/// <remarks/>
public string קוד_סניף
{
get
{
return this.קוד_סניףField;
}
set
{
this.קוד_סניףField = value;
}
}

/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute("כתובת_ה-ATM")]
public string כתובת_הATM
{
get
{
return this.כתובת_הATMField;
}
set
{
this.כתובת_הATMField = value;
}
}

/// <remarks/>
public string ישוב
{
get
{
return this.ישובField;
}
set
{
this.ישובField = value;
}
}

/// <remarks/>
public string עמלה
{
get
{
return this.עמלהField;
}
set
{
this.עמלהField = value;
}
}

/// <remarks/>
public string סוג_ATM
{
get
{
return this.סוג_ATMField;
}
set
{
this.סוג_ATMField = value;
}
}

/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute("מיקום_ה-ATM_ביחס_לסניף")]
public string מיקום_הATM_ביחס_לסניף
{
get
{
return this.מיקום_הATM_ביחס_לסניףField;
}
set
{
this.מיקום_הATM_ביחס_לסניףField = value;
}
}

/// <remarks/>
public string גישה_לנכים
{
get
{
return this.גישה_לנכיםField;
}
set
{
this.גישה_לנכיםField = value;
}
}

/// <remarks/>
public string קואורדינטת_X
{
get
{
return this.קואורדינטת_XField;
}
set
{
this.קואורדינטת_XField = value;
}
}

/// <remarks/>
public string קואורדינטת_Y
{
get
{
return this.קואורדינטת_YField;
}
set
{
this.קואורדינטת_YField = value;
}
}
}


}


2 changes: 2 additions & 0 deletions BE/BE.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ATM.cs" />
<Compile Include="BankAccount.cs" />
<Compile Include="BankDetails.cs" />
<Compile Include="Enum.cs" />
<Compile Include="Configuration.cs" />
<Compile Include="GuestRequest.cs" />
Expand Down
21 changes: 21 additions & 0 deletions BE/BankDetails.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BE
{
public class BankDetails
{
public int BankNumber { get; set; }
public String BankName { get; set; }
public List<BankBranch> Branches;
}

public class BankBranch
{
public int BranchNumber { get; set; }
public String BranchCity { get; set; }
}
}
7 changes: 5 additions & 2 deletions BE/Enum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ public enum HostingType
Zimmer, Hotel, Camping, RentingRoom
}

public enum Requirements
public enum GestRequirements
{
Necessary, Possible, NotNecessary
}

public enum UnitRequirements
{
Available, NotAvailable
}

}
14 changes: 1 addition & 13 deletions BE/HostingUnit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,8 @@ public class HostingUnit : requirement
public int HostingUnitKey { get; set; }
public Host Owner { get; set; }
public String HostingUnitName { get; set; }


[XmlIgnore]
//public bool[,] Diary { get; private set; }
public List<DateTime> Diary { get; set; }

//[XmlArray("Diary")]
//public bool[] DiaryDto
//{
// get { return Diary.Flatten(); }
// set { Diary = value.Expand(12); }
//}



public HostingUnit()
{
Diary = new List<DateTime>();
Expand Down
3 changes: 2 additions & 1 deletion BE/Order.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand All @@ -19,6 +19,7 @@ public class Order
public DateTime OrderDate { get; set; }

public DateTime CreateDate { get; set; }

public OrderStatus Status { get; set; }

public override string ToString()
Expand Down
22 changes: 10 additions & 12 deletions BE/requirement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,20 @@ namespace BE
[Serializable]
public class requirement
{

public Area Area { get; set; }
public String SubArea { get; set; }
public HostingType HostingType { get; set; }
public int Adults { get; set; }
public int Adults { get; set; }
public int Children { get; set; }
public Requirements Pool { get; set; }
public Requirements Jacuzzi { get; set; }
public Requirements Garden { get; set; }
public Requirements ChildrensAttractions { get; set; }
//********************
public Requirements SpredBads { get; set; }
public Requirements AirCondsner { get; set; }
public Requirements frisider { get; set; }
public Requirements SingogNaerBy { get; set; }
public Requirements NaerPublicTrensportion { get; set; }
public GestRequirements Pool { get; set; }
public GestRequirements Jacuzzi { get; set; }
public GestRequirements Garden { get; set; }
public GestRequirements ChildrensAttractions { get; set; }
public GestRequirements SpredBads { get; set; }
public GestRequirements AirCondsner { get; set; }
public GestRequirements frisider { get; set; }
public GestRequirements SingogNaerBy { get; set; }
public GestRequirements NaerPublicTrensportion { get; set; }

/// <summary>
/// to-string
Expand Down
2 changes: 1 addition & 1 deletion BL/FactorySingletonBL.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace BL
{
public class FactorySingletonBL
public static class FactorySingletonBL
{
private static MyBl instance = null;

Expand Down
7 changes: 5 additions & 2 deletions BL/IBL.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using BE;
using BE;
using System;
using System.Collections.Generic;
using System.Linq;
Expand All @@ -11,6 +11,7 @@ interface IBL
{
bool IsDateCorrect(DateTime start, DateTime end);
bool IsAccountCharged(Host host);

bool IsDateAvailable(DateTime start, DateTime end, int unitKey);
void CloseOrder(Order order);
void SendMail(Order order);
Expand All @@ -22,11 +23,13 @@ interface IBL
List<Order> OrdersUntilDate(int days);
int OrdersPerClient(GuestRequest req);
int OrdersPerUnit(HostingUnit unit);

bool AddGuestRequest(GuestRequest req);
void AddHostingUnit(HostingUnit unit);
IEnumerable<GuestRequest> GuestRequestBy(Func<GuestRequest, bool> predicate = null);
double averageOrdersPerClient();
double averageOrdersPerHostingUnit();

}
}
}

Loading