Skip to content

Dev #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MBC-SD wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Dev #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e829fc
Committing to dev branch
htetaung04 May 21, 2017
70b1aec
Database connection tested!
htetaung04 May 21, 2017
ad4092e
Data finding by id
May 22, 2017
cb5cdaf
commit 7:
May 22, 2017
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
42 changes: 33 additions & 9 deletions app/components/master/pointEntry/pointEntry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div ng-controller="pointEntryController" class="jumbotron text-center">
<div class="jumbotron text-center">
<br />
<md-content>
<md-toolbar class="md-accent">
<md-toolbar class="md-primary">
<div class="md-toolbar-tools">
<h2>Point Entry</h2>
</div>
Expand All @@ -14,19 +14,43 @@ <h2>Point Entry</h2>
<form novalidate name="pointEntryForm">
<md-input-container class="md-block">
<label>Point ID</label>
<input type="text" ng-model="point.pointId" required />
<input type="text" id="inputPointId" ng-model="point.pointId" style="font-variant-caps: all-petite-caps" ng-blur="find(point.pointId)"
focus="focuser" required />
</md-input-container>
<md-input-container class="md-block">
<label>Description</label>
<input type="text" ng-model="point.desc" required />
</md-input-container>

<md-button class="md-raised md-primary" ng-click="add()" ng-disabled="!pointEntryForm.$valid">Add</md-button>
<md-button class="md-raised md-primary" ng-click="add()" ng-disabled="!pointEntryForm.$valid">Add</md-button>
<md-button class="md-raised md-primary" ng-click="add()" ng-disabled="!pointEntryForm.$valid">Add</md-button>
<md-button class="md-raised md-primary" ng-click="add()" ng-disabled="!pointEntryForm.$valid">Add</md-button>
<md-button class="md-raised md-primary" ng-click="add()" ng-disabled="!pointEntryForm.$valid">Add</md-button>
<md-button class="md-raised md-primary" ng-click="add()" ng-disabled="!pointEntryForm.$valid">Add</md-button>
<div layout="row" layout-align="end" layout-wrap>
<md-button class="md-raised md-primary" ng-click="clearAll()">New</md-button>
<md-button class="md-raised md-primary" ng-click="save()" ng-disabled="enable.btnSave">Save</md-button>
<md-button class="md-raised md-primary" ng-click="edit()" ng-disabled="enable.edit">Edit</md-button>
<md-button class="md-raised md-warn" ng-click="delete()" ng-disabled="enable.delete">Delete</md-button>
<md-button class="md-raised md-primary" ng-click="reset()" ng-disabled="enable.reset">Reset</md-button>
<md-button class="md-raised md-primary" ng-click="list()">List</md-button>

<md-button class="md-raised md-primary" ng-click="getData()">Get Data</md-button>
</div>

<br />

<table class="table table-striped table-bordered">
<thead>
<tr class="text-info">
<th width="10">#</th>
<th>ID</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="h in points">
<td>{{$index + 1}}</td>
<td>{{h.pointId}}</td>
<td>{{h.desc}}</td>
</tr>
</tbody>
</table>
</form>
</md-card-content>
</md-card>
Expand Down
48 changes: 40 additions & 8 deletions app/components/master/pointEntry/pointEntryController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,58 @@

angular.module('hrApp').controller('pointEntryController', function ($scope) {
$scope.points = [];
angular.module('hrApp').controller('pointEntryController', function ($scope, $http) {
//$window.document.getElementById('inputPointId').focus();
$scope.focuser = true;

$scope.points = [];
var pointKey = 0;

$scope.point = {
key: 0,
pointId: "",
desc: ""
};

$scope.add = function () {
$scope.clearAll = function () {
$scope.focuser = true;
};
$scope.save = function () {
var l_point = angular.copy($scope.point);
l_point.pointId = ++pointKey;
l_point.key = ++pointKey;
$scope.points.push(l_point);
$scope.point.pointId = "";
$scope.point.desc = "";
};
$scope.edit = function () {

alert($scope.points.length);
}
};
$scope.delete = function () {

};
$scope.reset = function () {

};
$scope.list = function () {

};

$scope.remove = function (index) {
$scope.points.splice(index, 1);
}
};

$scope.find = function (id) {
$scope.chosen = $scope.points.filter(function (val) {
return val.pointId == id;
});
if ($scope.chosen.length > 0) {
$scope.point.desc = $scope.chosen[0].desc;
}
};

$scope.getData = function () {
alert('b');
$http.post('http://192.168.100.1/JSWebservice/MyWebservice.asmx/SelectData')
.then(function (response) {
$scope.holas = response.data;
alert($scope.holas);
})
};
});
53 changes: 53 additions & 0 deletions app/components/master/taxEntry/taxEntry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<br>
<div class="md-padding">
<md-content>
<md-toolbar style="background-color:deepskyblue; height:320px;">
<div class="md-toolbar-tools">
<h1>Group Entry</h1>
</div>

<md-card>
<md-card-content>
<form novalidate name="groupForm">
<md-input-container class="md-block">
<label>Tax ID</label>
<input type="text" ng-model="tax.calculation.taxId" required />
</md-input-container>
<md-input-container class="md-block">
<label>Description</label>
<input type="text" ng-model="tax.calculation.description" required/>
</md-input-container>

<div layout="row" layout-align="end" flex>
<md-button class="md-raised md-primary" ng-click="clearValue()">New</md-button>
<md-button class="md-raised md-primary" ng-disabled="!groupForm.$valid">Save</md-button>
<md-button class="md-raised md-primary">Edit</md-button>
<md-button class="md-raised md-warn">Delete</md-button>
<md-button class="md-raised md-primary">Reset</md-button>
<md-button class="md-raised md-primary">List</md-button>
</div>
</form>
<md-table-container>
</md-card-content>
</md-card>
</md-toolbar>
</md-content>
</div>
<table class="md-table event-table">
<thead class="md-head">
<tr class="md-row">
<th class="md-column" width="150px"></th>
<th class="md-column">Group ID</th>
<th class="md-column">Description</th>
</tr>
</thead>
<tbody class="md-body">
<tr ng-repeat="g in groups">
<td width="150px">
<md-button class="md-raised md-warn" ng-click="remove($index)">X</md-button>
</td>
<td>{{g.groupid}}</td>
<td>{{g.description}}</td>
</tr>
</tbody>
</table>
5 changes: 5 additions & 0 deletions app/components/master/taxEntry/taxEntryController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

angular.module('hrApp').controller('taxEntryController', function ($scope, $http) {
$scope.clearAll = function () {
};
});
20 changes: 20 additions & 0 deletions app/shared/directives.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
angular.module('hrApp').directive('focus', function ($timeout, $parse) {
return {
restrict: 'A',
link: function (scope, element, attrs) {
scope.$watch(attrs.focus, function (newValue, oldValue) {
if (newValue) { element[0].focus(); }
});
element.bind("blur", function (e) {
$timeout(function () {
scope.$apply(attrs.focus + "=false");
}, 0);
});
element.bind("focus", function (e) {
$timeout(function () {
scope.$apply(attrs.focus + "=true");
}, 0);
})
}
}
});
12 changes: 10 additions & 2 deletions assets/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ var hrApp = angular.module('hrApp', ['ngMaterial', 'ngRoute']);
// configure our routes
hrApp.config(function ($routeProvider) {
$routeProvider

// route for the point entry
.when('/masterPointEntry', {
templateUrl: 'app/components/master/pointEntry/pointEntry.html'
templateUrl: 'app/components/master/pointEntry/pointEntry.html',
controller: 'pointEntryController'
})
.when('/masterTaxEntry', {
templateUrl: 'app/components/master/taxEntry/taxEntry.html',
controller: 'taxEntryController'
})
});

Expand Down Expand Up @@ -79,3 +83,7 @@ hrApp.controller('aboutController', function ($scope) {
hrApp.controller('contactController', function ($scope) {
$scope.message = 'Contact us! JK. This is just a demo.';
});

hrApp.config(function ($httpProvider) {
delete $httpProvider.defaults.headers.common['X-Requested-With'];
});
8 changes: 6 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<md-button aria-label="Point Entry" ng-href="#masterPointEntry">
Point Entry
</md-button>
<md-button aria-label="Point Entry" ng-href="#masterTaxEntry">
Tax Entry
</md-button>
</md-sidenav>

<!-- HEADER AND NAVBAR -->
Expand Down Expand Up @@ -39,8 +42,7 @@

<!-- MAIN CONTENT AND INJECTED VIEWS -->
<div id="main">
<!-- angular templating -->
<!-- this is where content will be injected -->
<!-- angular templating: this is where content will be injected -->
<div ng-view></div>
</div>
</body>
Expand All @@ -51,5 +53,7 @@
<script src="assets/libs/frameworks/angular-aria.min.js"></script>
<script src="assets/libs/frameworks/angular-material.min.js"></script>
<script src="assets/js/app.js"></script>
<script src="app/shared/directives.js"></script>
<script src="app/components/master/pointEntry/pointEntryController.js"></script>

</html>