Commit 84d4497c authored by Evren Kutar's avatar Evren Kutar

hotfıx: filter interface

parent d69c7912
0.5.0
\ No newline at end of file
0.5.1
\ No newline at end of file
......@@ -3,17 +3,17 @@
<div class="right-sidebar-box">
<div class="right-sidebar-messages">
<div class="right-sidebar-title clearfix">
<h3>Tarih Aralığı</h3>
<h3>Tarİh Aralığı</h3>
</div>
<div class="right-sidebar-message-block">
<div class="col-md-6">
<br>
<label class="control-label" for="startDate">Baslangic</label>
<label class="control-label" for="startDate">Başlangıç</label>
<input type="text" name="startDate" class="form-control filterDate"/>
</div>
<div class="col-md-6">
<br>
<label class="control-label" for="endDate">Bitis</label>
<label class="control-label" for="endDate">Bitiş</label>
<input type="text" name="endDate" class="form-control filterDate"/>
</div>
</div>
......@@ -26,17 +26,17 @@
<div class="right-sidebar-messages">
<div class="right-sidebar-title clearfix">
<br><br>
<h3>Filtre basligi</h3>
<h3>Fİltre başlığı</h3>
</div>
<div class="right-sidebar-message-block">
<div class="col-md-12">
<br>
<label class="control-label" for="filterSelect">Secim</label>
<label class="control-label" for="filterSelect">Seçim</label>
<select name="filterSelect" id="filterSelect">
<option value="1">option 1</option>
<option value="2">option 2</option>
<option value="3">option 3</option>
<option value="4">option 4</option>
<option value="1">opsiyon 1</option>
<option value="2">opsiyon 2</option>
<option value="3">opsiyon 3</option>
<option value="4">opsiyon 4</option>
</select>
</div>
</div>
......
......@@ -5,4 +5,4 @@ angular.module('ulakbus.version', [
'ulakbus.version.version-directive'
])
.value('version', '0.5.0');
.value('version', '0.5.1');
......@@ -5,7 +5,7 @@ describe('ulakbus.version module', function() {
describe('version service', function() {
it('should return current version', inject(function(version) {
expect(version).toEqual('0.5.0');
expect(version).toEqual('0.5.1');
}));
});
});
......@@ -323,15 +323,15 @@ angular.module('formService', ['ui.bootstrap'])
};
var modelItems = [];
var modelKeys = [];
//var modelKeys = [];
angular.forEach(scope.model[k], function (value, mkey) {
modelItems.push({
"value": value[v.schema[0].name].key,
"name": value[v.schema[0].name].unicode
});
modelKeys.push(value[v.schema[0].name].key);
//modelKeys.push(value[v.schema[0].name].key);
});
scope.model[k] = angular.copy(modelKeys);
scope.model[k] = angular.copy(modelItems);
formitem = {
type: "template",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment