Merge pull request #60 from Pear-Trading/finn/categoryrelease
Amended category change for release
This commit is contained in:
commit
4a388a4c3e
4 changed files with 13 additions and 10 deletions
6
.gitattributes
vendored
6
.gitattributes
vendored
|
@ -15,3 +15,9 @@
|
||||||
*.PDF diff=astextplain
|
*.PDF diff=astextplain
|
||||||
*.rtf diff=astextplain
|
*.rtf diff=astextplain
|
||||||
*.RTF diff=astextplain
|
*.RTF diff=astextplain
|
||||||
|
|
||||||
|
# ensures font files are loaded as binary not text
|
||||||
|
*.ttf binary
|
||||||
|
*.eot binary
|
||||||
|
*.woff binary
|
||||||
|
*.woff2 binary
|
||||||
|
|
|
@ -2,6 +2,12 @@
|
||||||
|
|
||||||
# Next Release
|
# Next Release
|
||||||
|
|
||||||
|
# v0.1.2
|
||||||
|
|
||||||
|
* Removed unused button
|
||||||
|
* Added ability to choose category for transaction
|
||||||
|
* Added version bump on Angular
|
||||||
|
|
||||||
# v0.1.1
|
# v0.1.1
|
||||||
|
|
||||||
* Redid layout on circle customer view
|
* Redid layout on circle customer view
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<label class="col-md-3 form-control-label" for="text-input">Category</label>
|
<label class="col-md-3 form-control-label" for="text-input">Category</label>
|
||||||
<div class="col-md-9">
|
<div class="col-md-9">
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select type="text" class="form-control" [(ngModel)]="categoryId">
|
<select type="text" class="form-control" [(ngModel)]="categoryId" size="6">
|
||||||
<option value="">Uncategorised</option>
|
<option value="">Uncategorised</option>
|
||||||
<option *ngFor="let category of categoryIdList, let i=index" [ngValue]="category" >
|
<option *ngFor="let category of categoryIdList, let i=index" [ngValue]="category" >
|
||||||
{{ categoryNameList[i] }}
|
{{ categoryNameList[i] }}
|
||||||
|
|
|
@ -4,15 +4,6 @@
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<h4 class="card-title mb-0">All Purchases</h4>
|
<h4 class="card-title mb-0">All Purchases</h4>
|
||||||
</div><!--/.col-->
|
</div><!--/.col-->
|
||||||
<div class="col-sm-4 hidden-sm-down">
|
|
||||||
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
|
|
||||||
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
|
|
||||||
<label class="btn btn-outline-secondary active">
|
|
||||||
<input type="radio" name="options" id="option2" checked> Week
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div><!--/.col-->
|
|
||||||
</div><!--/.row-->
|
</div><!--/.row-->
|
||||||
<div class="chart-wrapper">
|
<div class="chart-wrapper">
|
||||||
<canvas baseChart class="chart"
|
<canvas baseChart class="chart"
|
||||||
|
|
Reference in a new issue