Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gandhimathi 2018-01-18 17:49:13 +05:30
commit 6c0a33dfda
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/assets/views/daybook/daybook.html
View File

@ -168,11 +168,11 @@
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.editpaidTo.$dirty && Form.editpaidTo.$invalid, 'has-success':Form.editpaidTo.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.editpaidTo.$dirty && Form.editpaidTo.$invalid, 'has-success':Form.editpaidTo.$valid}">
<label> <label>
Paid To / Received To Paid To / Received From
</label> </label>
<input type="text" name="editpaidTo" tabindex="1" placeholder="Enter Paid To / Received To" class="form-control" ng-model="myModel.paidTo" <input type="text" name="editpaidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModel.paidTo"
/> />
<span class="error text-small block" ng-if="Form.editpaidTo.$dirty && Form.editpaidTo.$invalid" ng-hide="Form.editpaidTo.$error.maxlength || Form.editpaidTo.$error.minlength || Form.editpaidTo.$error.pattern">Paid To / Received To is required.</span> <span class="error text-small block" ng-if="Form.editpaidTo.$dirty && Form.editpaidTo.$invalid" ng-hide="Form.editpaidTo.$error.maxlength || Form.editpaidTo.$error.minlength || Form.editpaidTo.$error.pattern">Paid To / Received From is required.</span>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label> <label>
@ -298,7 +298,7 @@
</div> </div>
<div class="col-md-4 form-group"> <div class="col-md-4 form-group">
<label> <label>
Paid To / Received To Paid To / Received From
</label> </label>
<input type="text" name="paidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModelAdd.paidTo" <input type="text" name="paidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModelAdd.paidTo"
/> />

5
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -24,7 +24,10 @@
height: 85px; height: 85px;
/*overflow-x: scroll;*/ /*overflow-x: scroll;*/
color: rgba(7, 21, 176, 0.7); color: rgba(7, 21, 176, 0.7);
overflow: auto overflow: auto;
display: flex;
justify-content: center;
flex-direction: column;
} }
/*.square { /*.square {
background-color: #00b; background-color: #00b;

18
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -24,7 +24,10 @@
height: 75px; height: 75px;
/*overflow-x: scroll;*/ /*overflow-x: scroll;*/
color: rgba(7, 21, 176, 0.7); color: rgba(7, 21, 176, 0.7);
overflow: auto overflow: auto;
display: flex;
justify-content: center;
flex-direction: column;
} }
/*.square { /*.square {
background-color: #00b; background-color: #00b;
@ -127,6 +130,12 @@
background-color: #5fba7d; background-color: #5fba7d;
text-align: center; text-align: center;
} }
/*#wrapper{
display: flex;
justify-content: center;
flex-direction: column;
height: 400px;
}*/
</style> </style>
<div class="row" ng-if="dataLengthIncome > 0"> <div class="row" ng-if="dataLengthIncome > 0">
@ -227,7 +236,14 @@
color: #FFF; color: #FFF;
background-color: #5fba7d; background-color: #5fba7d;
text-align: center; text-align: center;
} }
/*#wrapper{
display: flex;
justify-content: center;
flex-direction: column;
height: 400px;
}*/
</style> </style>
<div class="row" ng-if="dataLengthExpense > 0"> <div class="row" ng-if="dataLengthExpense > 0">