Skip to content

Commit 87cf3ba

Browse files
Pt4rPt4r
committed
Merge branch 'DEV'
dd
2 parents e6f2b4f + 30e658c commit 87cf3ba

File tree

9 files changed

+53
-13
lines changed

9 files changed

+53
-13
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
*.props
3+
<<<<<<< HEAD
34
Qualco3/.vs/Qualco3/v15/.suo
45
Qualco3/.vs/Qualco3/v15/sqlite3/storage.ide
56
Qualco3/Qualco3/obj/Debug/netcoreapp2.0/Qualco3.csproj.CoreCompileInputs.cache
@@ -8,3 +9,7 @@ Qualco3/Qualco3/obj/Qualco3.csproj.nuget.g.props
89
Qualco3/.vs/Qualco3/v15/sqlite3/storage.ide
910
Qualco3/.vs/Qualco3/v15/.suo
1011
Qualco3/Qualco3/bin/Debug/netcoreapp2.0/Qualco3.dll
12+
=======
13+
Qualco3/.vs/Qualco3/v15/sqlite3/storage.ide
14+
Qualco3/Qualco3/obj/Debug/netcoreapp2.0/Qualco3.csproj.CoreCompileInputs.cache
15+
>>>>>>> DEV

‎Qualco3/.vs/Qualco3/v15/.suo

15.5 KB
Binary file not shown.

‎Qualco3/.vs/Qualco3/v15/sqlite3/storage.ide

564 KB
Binary file not shown.

‎Qualco3/.vs/config/applicationhost.config

+2-6
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,11 @@
156156
</site>
157157
<site name="Qualco3" id="2">
158158
<application path="/" applicationPool="Clr4IntegratedAppPool">
159-
<<<<<<< HEAD
160-
<virtualDirectory path="/" physicalPath="C:\Users\Stratos\source\repos\q3\Qualco3\Qualco3" />
161-
=======
162-
<virtualDirectory path="/" physicalPath="C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3" />
163-
>>>>>>> master
159+
<virtualDirectory path="/" physicalPath="C:\Users\Stratos\Documents\GitHub\q3\Qualco3\Qualco3" />
164160
</application>
165161
<bindings>
166-
<binding protocol="http" bindingInformation="*:56140:localhost" />
167162
<binding protocol="https" bindingInformation="*:44381:localhost" />
163+
<binding protocol="http" bindingInformation="*:56140:localhost" />
168164
</bindings>
169165
</site>
170166
<siteDefaults>

‎Qualco3/Qualco3/Views/Bills/SubmitSelected.cshtml

+10-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<hr />
99
<br />
1010

11+
<<<<<<< HEAD
1112
@foreach (var item in Model.Bills)
1213
{
1314
<table>
@@ -31,6 +32,8 @@
3132
</table>
3233
}
3334

35+
=======
36+
>>>>>>> DEV
3437
<form id="Login" method="post">
3538
<div class="form-group">
3639
@*@foreach (var item in Model.Bills)
@@ -44,35 +47,36 @@
4447
</div>
4548
}*@
4649

47-
<label asp-for="SettlementType" class="col-md-2 control-label" hidden="hidden"></label>
50+
4851
<div class="col-md-10">
52+
<label asp-for="SettlementType" class="col-md-2 control-label" hidden="hidden"></label>
4953
<select asp-for="SettlementType" asp-items="@Model.SettlementTypes" onchange="onChange()"></select>
5054
</div>
5155

5256
<input asp-for="BillsStr" asp-items="@Model.BillsStr" type="hidden">
5357

54-
<label asp-for="TotalAmount" class="col-md-2 control-label" type="hidden"></label>
5558
<div class="col-md-10">
59+
<label asp-for="TotalAmount" class="col-md-2 control-label" type="hidden"></label>
5660
<input asp-for="TotalAmount" asp-items="@Model.TotalAmount.ToString("N2")">
5761
</div>
5862

59-
<label asp-for="MaxNoOfInstallments" class="col-md-2 control-label"></label>
6063
<div class="col-md-10">
64+
<label asp-for="MaxNoOfInstallments" class="col-md-2 control-label"></label>
6165
<select asp-for="MaxNoOfInstallments" asp-items="@Model.Installments" onchange="onChange()"></select>
6266
</div>
6367

64-
<label asp-for="Interest" class="col-md-2 control-label"></label>
6568
<div class="col-md-10">
69+
<label asp-for="Interest" class="col-md-2 control-label"></label>
6670
<input asp-for="Interest" asp-items="@Model.Interest">
6771
</div>
6872

69-
<label asp-for="IsAccepted" class="col-md-2 control-label"></label>
7073
<div class="col-md-10">
74+
<label asp-for="IsAccepted" class="col-md-2 control-label"></label>
7175
<input asp-for="IsAccepted" asp-items="@Model.IsAccepted">
7276
</div>
7377

74-
<label asp-for="DownPayment" class="col-md-2 control-label"></label>
7578
<div class="col-md-10">
79+
<label asp-for="DownPayment" class="col-md-2 control-label"></label>
7680
<input asp-for="DownPayment" asp-items="@Model.DownPayment">
7781
</div>
7882
</div>

‎Qualco3/Qualco3/appsettings.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"ConnectionStrings": {
3+
<<<<<<< HEAD
34
// "DefaultConnection": "Server=tcp:qualco3.database.windows.net,1433;Initial Catalog=Qualco3;Persist Security Info=False;User ID=q3;Password=qualco123!@#;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;",
45
"DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=Qualco3;Trusted_Connection=True;MultipleActiveResultSets=true"
6+
=======
7+
8+
//"DefaultConnection": "Server=tcp:qualco3.database.windows.net,1433;Initial Catalog=Qualco3;Persist Security Info=False;User ID=q3;Password=qualco123!@#;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;",
9+
"DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=Qualco3;Trusted_Connection=True;MultipleActiveResultSets=true"
10+
>>>>>>> DEV
511
},
612
"Logging": {
713
"IncludeScopes": false,

‎Qualco3/Qualco3/obj/Debug/netcoreapp2.0/Qualco3.csproj.FileListAbsolute.txt

+16
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ C:\Users\nik\Documents\Visual Studio 2017\Projects\Qualco3\Qualco3\obj\Debug\net
2424
C:\Users\nik\Documents\Visual Studio 2017\Projects\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.dll
2525
C:\Users\nik\Documents\Visual Studio 2017\Projects\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.pdb
2626
<<<<<<< HEAD
27+
<<<<<<< HEAD
2728
C:\Users\Stratos\source\repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.deps.json
2829
C:\Users\Stratos\source\repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.runtimeconfig.json
2930
C:\Users\Stratos\source\repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.runtimeconfig.dev.json
@@ -39,6 +40,21 @@ C:\Users\Stratos\source\repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3
3940
C:\Users\Stratos\source\repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.pdb
4041
=======
4142
>>>>>>> master
43+
=======
44+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.deps.json
45+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.runtimeconfig.json
46+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.runtimeconfig.dev.json
47+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.dll
48+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.pdb
49+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Db.dll
50+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Db.pdb
51+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.csprojResolveAssemblyReference.cache
52+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.csproj.CoreCompileInputs.cache
53+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.AssemblyInfoInputs.cache
54+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.AssemblyInfo.cs
55+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.dll
56+
C:\Users\Stratos\Source\Repos\q3\Qualco3\Qualco3\obj\Debug\netcoreapp2.0\Qualco3.pdb
57+
>>>>>>> DEV
4258
C:\Users\Stratos\Documents\GitHub\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.deps.json
4359
C:\Users\Stratos\Documents\GitHub\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.runtimeconfig.json
4460
C:\Users\Stratos\Documents\GitHub\q3\Qualco3\Qualco3\bin\Debug\netcoreapp2.0\Qualco3.runtimeconfig.dev.json

‎Qualco3/Qualco3/obj/Qualco3.csproj.nuget.cache

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"version": 1,
3+
"dgSpecHash": "YJY+p5jrFwN2T4VSniO33YJ50wbETbDIugn712knn9MvqvdHsaNiwvLt1m+H/Sf0GIuYMmA/S8awX4AJYpwgIw==",
4+
"success": true
5+
}

‎Qualco3/Qualco3/obj/project.assets.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -13684,5 +13684,13 @@
1368413684
"warn": true
1368513685
}
1368613686
}
13687-
}
13687+
},
13688+
"logs": [
13689+
{
13690+
"code": "Undefined",
13691+
"level": "Warning",
13692+
"warningLevel": 1,
13693+
"message": "Problem reading the cache file C:\\Users\\Stratos\\source\\repos\\q3\\Qualco3\\Qualco3\\obj\\Qualco3.csproj.nuget.cache : Invalid property identifier character: <. Path 'version', line 3, position 0."
13694+
}
13695+
]
1368813696
}

0 commit comments

Comments
 (0)