TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Member status filter Bootstrap frontend added

Browse Source
This commit is contained in:
Aarni
2016-12-08 16:10:06 +02:00
parent 55a77ffccb
commit c7203cb149
4 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/static/html/jasenlista.html
+11 -1
View File
@@ -1,4 +1,14 @@
<h3> Jäsenlista (jäseniä {{members.length}})</h3>
<div class="row">
<div class="col-md-7">
<h3> Jäsenlista (jäseniä {{members.length}})</h3>
</div>
<div class="col-md-3">
<md-datepicker ng-model="datePicker" md-placeholder="Filter by date"></md-datepicker>
</div>
<div class="col-md-1 offset-md-1"> <!-- style="vertical-align: bottom;"-->
<input type="button" value="Clear filter" class="btn btn-success" ng-click="clear_filter()" />
</div>
</div>
<div>
<input type="button" value="Lataa CSV" class="btn btn-info" ng-click="loadCSV()"/>
<table id="choose-address-table" class="table table-striped">
members/static/js/appconfig.js
+1 -1
View File
@@ -1,4 +1,4 @@
var app = angular.module('memberApp', ['ngRoute']);
var app = angular.module('memberApp', ['ngRoute','ngMaterial','ngMessages']);
app.config(['$httpProvider', function ($httpProvider) {
$httpProvider.defaults.xsrfCookieName = 'csrftoken';
members/static/js/members_controllers.js
+20
View File
@@ -98,6 +98,26 @@ app.controller("getController", function($scope, $http, $window, $location){
}
);
};
$scope.datePicker = null;
$scope.filter_by_date = function() {
if ($scope.datePicker == null)
{
}
else
{
}
};
$scope.clear_filter = function() {
$scope.datePicker = null;
$scope.getFunction();
};
$scope.$watch('datePicker', function(newValue, oldValue) {
$scope.filter_by_date();
});
});
app.controller("postController", function($scope, $http, $location) {
members/templates/members_index.html
+13 -4
View File
@@ -9,12 +9,21 @@
<title>Jäsenrekisteri</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src = "https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<link href = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css" rel = "stylesheet">
<script src = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css" rel = "stylesheet">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.js"></script>
<script src = "http://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-route.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-route.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<!-- DatePicker -->
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-messages.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-aria.min.js"></script>
{%load staticfiles %}
<script src="/static/js/jquery.noty.packaged.js"></script>
<script src="/static/js/appconfig.js"></script>