Skip to content

Commit 7278436

Browse files
author
marvinvperez
committed
Migrated to VS2017
1 parent 1ab5a12 commit 7278436

30 files changed

Lines changed: 157 additions & 472 deletions

‎accountgo.sln‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.csproj", "{9B652491-4E9C-45E0-BE5B-EA6AF892F380}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "src\Services\Services.csproj", "{C02DECC9-2A82-42C0-8F26-D0AE6559AC5E}"
9-
EndProject
10-
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "SQL.AccountGo", "database\SQL.AccountGo\SQL.AccountGo.sqlproj", "{F0360E8D-C07F-4442-BB61-FB7C4C495BDD}"
11-
EndProject
126
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Presentation", "Presentation", "{0295DFAC-BF6E-46C0-A63D-FBE9AF3C04E5}"
137
EndProject
148
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{34EEC2A7-F6F1-4D08-A685-9C39E1466B21}"
@@ -17,9 +11,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Domain", "Domain", "{B4CE3C
1711
EndProject
1812
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{B5D35D0C-387C-44FA-9A70-6FE24DAE5728}"
1913
EndProject
20-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Api", "src\Api\Api.xproj", "{09096FEC-DA29-4914-B046-CD280220C52A}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.csproj", "{9B652491-4E9C-45E0-BE5B-EA6AF892F380}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Services", "src\Services\Services.csproj", "{C02DECC9-2A82-42C0-8F26-D0AE6559AC5E}"
17+
EndProject
18+
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "SQL.AccountGo", "database\SQL.AccountGo\SQL.AccountGo.sqlproj", "{F0360E8D-C07F-4442-BB61-FB7C4C495BDD}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "src\Api\Api.csproj", "{09096FEC-DA29-4914-B046-CD280220C52A}"
2121
EndProject
22-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AccountGoWeb", "src\AccountGoWeb\AccountGoWeb.xproj", "{9CA13D2D-D6E2-4201-946C-81D1E6093404}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccountGoWeb", "src\AccountGoWeb\AccountGoWeb.csproj", "{9CA13D2D-D6E2-4201-946C-81D1E6093404}"
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dto", "src\Dto\Dto.csproj", "{1E610F55-2D74-4856-818B-0D0B47601B75}"
2525
EndProject

‎src/AccountGoWeb/AccountGoWeb.csproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net462</TargetFramework>
5+
<PreserveCompilationContext>true</PreserveCompilationContext>
6+
<AssemblyName>AccountGoWeb</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
<PackageId>AccountGoWeb</PackageId>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<None Include="App.config" />
13+
<None Update="wwwroot\**\*;Views\**\*;Areas\**\Views">
14+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
15+
</None>
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
20+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.1.2" />
22+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
23+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
27+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
30+
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="1.1.1" />
31+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.1" />
32+
<PackageReference Include="BundlerMinifier.Core" Version="2.4.337" />
33+
<PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
34+
<PackageReference Include="ExpressiveAnnotations" Version="2.9.2" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
38+
<Reference Include="System" />
39+
<Reference Include="Microsoft.CSharp" />
40+
</ItemGroup>
41+
<ItemGroup>
42+
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
43+
</ItemGroup>
44+
<ItemGroup>
45+
<ProjectReference Include="..\Dto\Dto.csproj" />
46+
</ItemGroup>
47+
</Project>

‎src/AccountGoWeb/AccountGoWeb.xproj‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/AccountGoWeb/Scripts/Financials/JournalEntry.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class JournalEntryHeader extends React.Component<any, {}>{
157157
<div className="col-sm-6">
158158
<div className="row">
159159
<div className="col-sm-2">Posted</div>
160-
<div className="col-sm-10"><input type="checkbox" readOnly checked={store.journalEntry.posted === true ? "checked" : ""} /></div>
160+
<div className="col-sm-10"><input type="checkbox" readOnly checked={store.journalEntry.posted === true ? true : false} /></div>
161161
</div>
162162
</div>
163163
</div>
@@ -196,8 +196,8 @@ class JournalEntryLines extends React.Component<any, {}>{
196196
<tr key={i}>
197197
<td><SelectAccount store={store} row={i} selected={store.journalEntry.journalEntryLines[i].accountId} /></td>
198198
<td><SelectDebitCredit store={store} row={i} selected={store.journalEntry.journalEntryLines[i].drcr} /></td>
199-
<td><input type="text" className="form-control" name={i} onChange={this.onChangeAmount.bind(this) } value={store.journalEntry.journalEntryLines[i].amount} /></td>
200-
<td><input type="text" className="form-control" name={i} onChange={this.onChangeMemo.bind(this) } value={store.journalEntry.journalEntryLines[i].memo || ''} /></td>
199+
<td><input type="text" className="form-control" name={i.toString()} onChange={this.onChangeAmount.bind(this)} value={store.journalEntry.journalEntryLines[i].amount} /></td>
200+
<td><input type="text" className="form-control" name={i.toString()} onChange={this.onChangeMemo.bind(this) } value={store.journalEntry.journalEntryLines[i].memo || ''} /></td>
201201
<td>
202202
<button type="button" className="btn btn-box-tool" onClick={this.onClickRemoveLineItem.bind(this, i) }>
203203
<i className="fa fa-fw fa-times"></i>

‎src/AccountGoWeb/Scripts/Purchasing/PurchaseInvoice.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,11 @@ class PurchaseInvoiceLines extends React.Component<any, {}>{
280280
<tr key={i}>
281281
<td><label>{newLine}</label></td>
282282
<td><SelectLineItem store={store} row={i} selected={store.purchaseInvoice.purchaseInvoiceLines[i].itemId} /></td>
283-
<td><input type="text" className="form-control" name={i} value={store.purchaseInvoice.purchaseInvoiceLines[i].itemId} onChange={this.onChangeItem.bind(this) } /></td>
283+
<td><input type="text" className="form-control" name={i.toString()} value={store.purchaseInvoice.purchaseInvoiceLines[i].itemId} onChange={this.onChangeItem.bind(this) } /></td>
284284
<td><SelectLineMeasurement row={i} store={store} selected={store.purchaseInvoice.purchaseInvoiceLines[i].measurementId} /></td>
285-
<td><input type="text" className="form-control" name={i} value={store.purchaseInvoice.purchaseInvoiceLines[i].quantity} onChange={this.onChangeQuantity.bind(this)} /></td>
286-
<td><input type="text" className="form-control" name={i} value={store.purchaseInvoice.purchaseInvoiceLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
287-
<td><input type="text" className="form-control" name={i} value={store.purchaseInvoice.purchaseInvoiceLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
285+
<td><input type="text" className="form-control" name={i.toString()} value={store.purchaseInvoice.purchaseInvoiceLines[i].quantity} onChange={this.onChangeQuantity.bind(this)} /></td>
286+
<td><input type="text" className="form-control" name={i.toString()} value={store.purchaseInvoice.purchaseInvoiceLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
287+
<td><input type="text" className="form-control" name={i.toString()} value={store.purchaseInvoice.purchaseInvoiceLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
288288
<td>{store.getLineTotal(i)}</td>
289289
<td>
290290
<button type="button" className="btn btn-box-tool" onClick={this.onClickRemoveLineItem.bind(this, i) }>

‎src/AccountGoWeb/Scripts/Purchasing/PurchaseOrder.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ class PurchaseOrderLines extends React.Component<any, {}>{
199199
<tr key={i}>
200200
<td><label>{newLine}</label></td>
201201
<td><SelectLineItem store={store} row={i} selected={store.purchaseOrder.purchaseOrderLines[i].itemId} /></td>
202-
<td><input className="form-control" type="text" name={i} value={store.purchaseOrder.purchaseOrderLines[i].code} onBlur={this.onFocusOutItem.bind(this, i, false) } onChange={this.onChangeCode.bind(this) } /></td>
202+
<td><input className="form-control" type="text" name={i.toString()} value={store.purchaseOrder.purchaseOrderLines[i].code} onBlur={this.onFocusOutItem.bind(this, i, false) } onChange={this.onChangeCode.bind(this) } /></td>
203203
<td><SelectLineMeasurement row={i} store={store} selected={store.purchaseOrder.purchaseOrderLines[i].measurementId} /></td>
204-
<td><input type="text" className="form-control" name={i} value={store.purchaseOrder.purchaseOrderLines[i].quantity} onChange={this.onChangeQuantity.bind(this)} /></td>
205-
<td><input type="text" className="form-control" name={i} value={store.purchaseOrder.purchaseOrderLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
206-
<td><input type="text" className="form-control" name={i} value={store.purchaseOrder.purchaseOrderLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
204+
<td><input type="text" className="form-control" name={i.toString()} value={store.purchaseOrder.purchaseOrderLines[i].quantity} onChange={this.onChangeQuantity.bind(this)} /></td>
205+
<td><input type="text" className="form-control" name={i.toString()} value={store.purchaseOrder.purchaseOrderLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
206+
<td><input type="text" className="form-control" name={i.toString()} value={store.purchaseOrder.purchaseOrderLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
207207
<td>{store.getLineTotal(i) }</td>
208208
<td>
209209
<button type="button" className="btn btn-box-tool" onClick={this.onClickRemoveLineItem.bind(this, i) }>
@@ -245,7 +245,7 @@ class PurchaseOrderLines extends React.Component<any, {}>{
245245
<td><SelectLineItem store={store} controlId="optNewItemId" /></td>
246246
<td><input className="form-control" type="text" id="txtNewCode" onBlur={this.onFocusOutItem.bind(this, i, true) } /></td>
247247
<td><SelectLineMeasurement store={store} controlId="optNewMeasurementId" /></td>
248-
<td><input className="form-control" type="text" id="txtNewQuantity" defaultValue={1} /></td>
248+
<td><input className="form-control" type="text" id="txtNewQuantity" defaultValue="1" /></td>
249249
<td><input className="form-control" type="text" id="txtNewAmount" /></td>
250250
<td><input className="form-control" type="text" id="txtNewDiscount" /></td>
251251
<td></td>

‎src/AccountGoWeb/Scripts/Quotations/SalesQuotation.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,11 @@ class SalesQuotationLines extends React.Component<any, {}>{
256256
<tr key={i}>
257257
<td><label>{newLine}</label></td>
258258
<td><SelectLineItem store={store} row={i} selected={store.salesQuotation.salesQuotationLines[i].itemId} /></td>
259-
<td><input className="form-control" type="text" name={i} value={store.salesQuotation.salesQuotationLines[i].code} onBlur={this.onFocusOutItem.bind(this, i, false) } onChange={this.onChangeCode.bind(this) } /></td>
259+
<td><input className="form-control" type="text" name={i.toString()} value={store.salesQuotation.salesQuotationLines[i].code} onBlur={this.onFocusOutItem.bind(this, i, false) } onChange={this.onChangeCode.bind(this) } /></td>
260260
<td><SelectLineMeasurement row={i} store={store} selected={store.salesQuotation.salesQuotationLines[i].measurementId} /></td>
261-
<td><input className="form-control" type="text" name={i} value={store.salesQuotation.salesQuotationLines[i].quantity} onChange={this.onChangeQuantity.bind(this) } /></td>
262-
<td><input className="form-control" type="text" name={i} value={store.salesQuotation.salesQuotationLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
263-
<td><input className="form-control" type="text" name={i} value={store.salesQuotation.salesQuotationLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
261+
<td><input className="form-control" type="text" name={i.toString()} value={store.salesQuotation.salesQuotationLines[i].quantity} onChange={this.onChangeQuantity.bind(this) } /></td>
262+
<td><input className="form-control" type="text" name={i.toString()} value={store.salesQuotation.salesQuotationLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
263+
<td><input className="form-control" type="text" name={i.toString()} value={store.salesQuotation.salesQuotationLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
264264
<td>{store.getLineTotal(i) }</td>
265265
<td>
266266
<button type="button" className="btn btn-box-tool" onClick={this.onClickRemoveLineItem.bind(this, i) }>

‎src/AccountGoWeb/Scripts/Sales/SalesInvoice.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,11 @@ class SalesInvoiceLines extends React.Component<any, {}>{
281281
<tr key={i}>
282282
<td><label>{newLine}</label></td>
283283
<td><SelectLineItem store={store} row={i} selected={store.salesInvoice.salesInvoiceLines[i].itemId} /></td>
284-
<td><input className="form-control" type="text" name={i} value={store.salesInvoice.salesInvoiceLines[i].code} onBlur={this.onFocusOutItem.bind(this, i, false) } onChange={this.onChangeCode.bind(this) } /></td>
284+
<td><input className="form-control" type="text" name={i.toString()} value={store.salesInvoice.salesInvoiceLines[i].code} onBlur={this.onFocusOutItem.bind(this, i, false) } onChange={this.onChangeCode.bind(this) } /></td>
285285
<td><SelectLineMeasurement row={i} store={store} selected={store.salesInvoice.salesInvoiceLines[i].measurementId} /></td>
286-
<td><input type="text" className="form-control" name={i} value={store.salesInvoice.salesInvoiceLines[i].quantity} onChange={this.onChangeQuantity.bind(this)} /></td>
287-
<td><input type="text" className="form-control" name={i} value={store.salesInvoice.salesInvoiceLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
288-
<td><input type="text" className="form-control" name={i} value={store.salesInvoice.salesInvoiceLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
286+
<td><input type="text" className="form-control" name={i.toString()} value={store.salesInvoice.salesInvoiceLines[i].quantity} onChange={this.onChangeQuantity.bind(this)} /></td>
287+
<td><input type="text" className="form-control" name={i.toString()} value={store.salesInvoice.salesInvoiceLines[i].amount} onChange={this.onChangeAmount.bind(this) } /></td>
288+
<td><input type="text" className="form-control" name={i.toString()} value={store.salesInvoice.salesInvoiceLines[i].discount} onChange={this.onChangeDiscount.bind(this) } /></td>
289289
<td>{store.getLineTotal(i) }</td>
290290
<td>
291291
<button type="button" className="btn btn-box-tool" onClick={this.onClickRemoveLineItem.bind(this, i) }>

0 commit comments

Comments
 (0)