Kaufdatum implementiert, Sortierung in DESC geändert

This commit is contained in:
Carsten Hilmer 2016-02-03 12:55:09 +01:00
parent fc1cc51ac4
commit 5b51b8b31f
26 changed files with 49 additions and 29 deletions

View File

@ -41,8 +41,8 @@
<file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true"> <file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java"> <entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3419355"> <state vertical-scroll-proportion="0.8160535">
<caret line="75" column="47" selection-start-line="75" selection-start-column="47" selection-end-line="75" selection-end-column="47" /> <caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
<folding> <folding>
<element signature="e#0#38645#0" expanded="false" /> <element signature="e#0#38645#0" expanded="false" />
<element signature="imports" expanded="false" /> <element signature="imports" expanded="false" />
@ -66,7 +66,7 @@
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js"> <entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="416" column="0" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" /> <caret line="421" column="0" selection-start-line="421" selection-start-column="0" selection-end-line="421" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1264,7 +1264,7 @@
</option> </option>
<option name="modificationStamps"> <option name="modificationStamps">
<map> <map>
<entry key="$PROJECT_DIR$" value="5817799017023" /> <entry key="$PROJECT_DIR$" value="5817820619913" />
</map> </map>
</option> </option>
<option name="projectBuildClasspath"> <option name="projectBuildClasspath">
@ -1896,7 +1896,7 @@
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35639685" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.57310706" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@ -1978,7 +1978,7 @@
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js"> <entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="416" column="0" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" /> <caret line="421" column="0" selection-start-line="421" selection-start-column="0" selection-end-line="421" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -2001,8 +2001,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java"> <entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3419355"> <state vertical-scroll-proportion="0.8160535">
<caret line="75" column="47" selection-start-line="75" selection-start-column="47" selection-end-line="75" selection-end-column="47" /> <caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
<folding> <folding>
<element signature="e#0#38645#0" expanded="false" /> <element signature="e#0#38645#0" expanded="false" />
<element signature="imports" expanded="false" /> <element signature="imports" expanded="false" />

View File

@ -1,6 +1,6 @@
angular.module('starter.controllers', []) angular.module('starter.controllers', [])
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) { .controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http,$filter) {
$scope.preis=""; $scope.preis="";
$scope.name=""; $scope.name="";
@ -306,6 +306,7 @@ $scope.show = function() {
// File name only // File name only
var filename = url.split("/").pop(); var filename = url.split("/").pop();
var Kaufdatum='';
// Save location // Save location
//var targetPath = cordova.file.externalRootDirectory + filename; //var targetPath = cordova.file.externalRootDirectory + filename;
var targetPath = cordova.file.applicationStorageDirectory + filename; var targetPath = cordova.file.applicationStorageDirectory + filename;
@ -322,8 +323,11 @@ $scope.show = function() {
$scope.item={name: $scope.name, bild: $scope.targetpublicPath}; $scope.item={name: $scope.name, bild: $scope.targetpublicPath};
$scope.items.push($scope.item); $scope.items.push($scope.item);
Kaufdatum = $filter('date')(new Date(),'dd.MM.yyyy - H:mm:ss');
//itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath //itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath
$database.setBuys($scope.name,$scope.filename,$scope.freitext,'','', $scope.targetpublicPath); $database.setBuys($scope.name,$scope.filename,$scope.freitext, Kaufdatum,'', $scope.targetpublicPath);
//Ordner erstellen auf SD-Karte //Ordner erstellen auf SD-Karte
$cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false) $cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false)
.then(function (success) { .then(function (success) {
@ -372,6 +376,7 @@ $scope.show = function() {
*/ */
}) })
.controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) { .controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) {

View File

@ -73,7 +73,7 @@ angular.module('starter.services', [])
}, },
getAllBuys: function(){ getAllBuys: function(){
var ArrayQ=[]; var ArrayQ=[];
query="SELECT * FROM buys order by id ASC"; query="SELECT * FROM buys order by id DESC";
return $cordovaSQLite.execute(self.db,query). return $cordovaSQLite.execute(self.db,query).
then(function(result) { then(function(result) {
for(j=0;j<result.rows.length;j++){ for(j=0;j<result.rows.length;j++){

View File

@ -10,7 +10,7 @@
<div class="list card"> <div class="list card">
<div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}"> <div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}">
<h2> <div class="oleo">{{i.name}}</div> </h2> <h2> <div class="oleo">{{i.name}}</div> </h2><div class="oleo-vsmall">{{i.kaufdatum}}</div>
</div> </div>
<div class="item item-body"> <div class="item item-body">

View File

@ -1,6 +1,6 @@
angular.module('starter.controllers', []) angular.module('starter.controllers', [])
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) { .controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http,$filter) {
$scope.preis=""; $scope.preis="";
$scope.name=""; $scope.name="";
@ -306,6 +306,7 @@ $scope.show = function() {
// File name only // File name only
var filename = url.split("/").pop(); var filename = url.split("/").pop();
var Kaufdatum='';
// Save location // Save location
//var targetPath = cordova.file.externalRootDirectory + filename; //var targetPath = cordova.file.externalRootDirectory + filename;
var targetPath = cordova.file.applicationStorageDirectory + filename; var targetPath = cordova.file.applicationStorageDirectory + filename;
@ -322,8 +323,11 @@ $scope.show = function() {
$scope.item={name: $scope.name, bild: $scope.targetpublicPath}; $scope.item={name: $scope.name, bild: $scope.targetpublicPath};
$scope.items.push($scope.item); $scope.items.push($scope.item);
Kaufdatum = $filter('date')(new Date(),'dd.MM.yyyy - H:mm:ss');
//itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath //itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath
$database.setBuys($scope.name,$scope.filename,$scope.freitext,'','', $scope.targetpublicPath); $database.setBuys($scope.name,$scope.filename,$scope.freitext, Kaufdatum,'', $scope.targetpublicPath);
//Ordner erstellen auf SD-Karte //Ordner erstellen auf SD-Karte
$cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false) $cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false)
.then(function (success) { .then(function (success) {
@ -372,6 +376,7 @@ $scope.show = function() {
*/ */
}) })
.controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) { .controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) {

View File

@ -73,7 +73,7 @@ angular.module('starter.services', [])
}, },
getAllBuys: function(){ getAllBuys: function(){
var ArrayQ=[]; var ArrayQ=[];
query="SELECT * FROM buys order by id ASC"; query="SELECT * FROM buys order by id DESC";
return $cordovaSQLite.execute(self.db,query). return $cordovaSQLite.execute(self.db,query).
then(function(result) { then(function(result) {
for(j=0;j<result.rows.length;j++){ for(j=0;j<result.rows.length;j++){

View File

@ -10,7 +10,7 @@
<div class="list card"> <div class="list card">
<div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}"> <div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}">
<h2> <div class="oleo">{{i.name}}</div> </h2> <h2> <div class="oleo">{{i.name}}</div> </h2><div class="oleo-vsmall">{{i.kaufdatum}}</div>
</div> </div>
<div class="item item-body"> <div class="item item-body">

View File

@ -1,6 +1,6 @@
angular.module('starter.controllers', []) angular.module('starter.controllers', [])
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) { .controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http,$filter) {
$scope.preis=""; $scope.preis="";
$scope.name=""; $scope.name="";
@ -306,6 +306,7 @@ $scope.show = function() {
// File name only // File name only
var filename = url.split("/").pop(); var filename = url.split("/").pop();
var Kaufdatum='';
// Save location // Save location
//var targetPath = cordova.file.externalRootDirectory + filename; //var targetPath = cordova.file.externalRootDirectory + filename;
var targetPath = cordova.file.applicationStorageDirectory + filename; var targetPath = cordova.file.applicationStorageDirectory + filename;
@ -322,8 +323,11 @@ $scope.show = function() {
$scope.item={name: $scope.name, bild: $scope.targetpublicPath}; $scope.item={name: $scope.name, bild: $scope.targetpublicPath};
$scope.items.push($scope.item); $scope.items.push($scope.item);
Kaufdatum = $filter('date')(new Date(),'dd.MM.yyyy - H:mm:ss');
//itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath //itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath
$database.setBuys($scope.name,$scope.filename,$scope.freitext,'','', $scope.targetpublicPath); $database.setBuys($scope.name,$scope.filename,$scope.freitext, Kaufdatum,'', $scope.targetpublicPath);
//Ordner erstellen auf SD-Karte //Ordner erstellen auf SD-Karte
$cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false) $cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false)
.then(function (success) { .then(function (success) {
@ -372,6 +376,7 @@ $scope.show = function() {
*/ */
}) })
.controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) { .controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) {

View File

@ -73,7 +73,7 @@ angular.module('starter.services', [])
}, },
getAllBuys: function(){ getAllBuys: function(){
var ArrayQ=[]; var ArrayQ=[];
query="SELECT * FROM buys order by id ASC"; query="SELECT * FROM buys order by id DESC";
return $cordovaSQLite.execute(self.db,query). return $cordovaSQLite.execute(self.db,query).
then(function(result) { then(function(result) {
for(j=0;j<result.rows.length;j++){ for(j=0;j<result.rows.length;j++){

View File

@ -10,7 +10,7 @@
<div class="list card"> <div class="list card">
<div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}"> <div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}">
<h2> <div class="oleo">{{i.name}}</div> </h2> <h2> <div class="oleo">{{i.name}}</div> </h2><div class="oleo-vsmall">{{i.kaufdatum}}</div>
</div> </div>
<div class="item item-body"> <div class="item item-body">

View File

@ -18,7 +18,7 @@ document.getElementById(id+'Link').style.display = 'none';
<body> <body>
<h1>Lint Report</h1> <h1>Lint Report</h1>
<div class="titleSeparator"></div> <div class="titleSeparator"></div>
Check performed at Wed Feb 03 09:53:46 CET 2016.<br/> Check performed at Wed Feb 03 12:52:32 CET 2016.<br/>
6 errors and 0 warnings found:<br/><br/> 6 errors and 0 warnings found:<br/><br/>
<table class="overview"> <table class="overview">
<tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a> <tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a>

View File

@ -1,6 +1,6 @@
angular.module('starter.controllers', []) angular.module('starter.controllers', [])
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) { .controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http,$filter) {
$scope.preis=""; $scope.preis="";
$scope.name=""; $scope.name="";
@ -306,6 +306,7 @@ $scope.show = function() {
// File name only // File name only
var filename = url.split("/").pop(); var filename = url.split("/").pop();
var Kaufdatum='';
// Save location // Save location
//var targetPath = cordova.file.externalRootDirectory + filename; //var targetPath = cordova.file.externalRootDirectory + filename;
var targetPath = cordova.file.applicationStorageDirectory + filename; var targetPath = cordova.file.applicationStorageDirectory + filename;
@ -322,8 +323,11 @@ $scope.show = function() {
$scope.item={name: $scope.name, bild: $scope.targetpublicPath}; $scope.item={name: $scope.name, bild: $scope.targetpublicPath};
$scope.items.push($scope.item); $scope.items.push($scope.item);
Kaufdatum = $filter('date')(new Date(),'dd.MM.yyyy - H:mm:ss');
//itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath //itemName,itemBild,itemBildtext,itemKaufdatum,itemappimgpath,itemappimgpublicpath
$database.setBuys($scope.name,$scope.filename,$scope.freitext,'','', $scope.targetpublicPath); $database.setBuys($scope.name,$scope.filename,$scope.freitext, Kaufdatum,'', $scope.targetpublicPath);
//Ordner erstellen auf SD-Karte //Ordner erstellen auf SD-Karte
$cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false) $cordovaFile.createDir(cordova.file.externalRootDirectory, "WolleRosenKaufen", false)
.then(function (success) { .then(function (success) {
@ -372,6 +376,7 @@ $scope.show = function() {
*/ */
}) })
.controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) { .controller('BuysCtrl', function($scope, $database,$location,$ionicModal,$ionicLoading,$timeout) {

View File

@ -73,7 +73,7 @@ angular.module('starter.services', [])
}, },
getAllBuys: function(){ getAllBuys: function(){
var ArrayQ=[]; var ArrayQ=[];
query="SELECT * FROM buys order by id ASC"; query="SELECT * FROM buys order by id DESC";
return $cordovaSQLite.execute(self.db,query). return $cordovaSQLite.execute(self.db,query).
then(function(result) { then(function(result) {
for(j=0;j<result.rows.length;j++){ for(j=0;j<result.rows.length;j++){

View File

@ -10,7 +10,7 @@
<div class="list card"> <div class="list card">
<div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}"> <div class="item item-avatar"> <img ng-src="{{i.appimgpublicpath}}">
<h2> <div class="oleo">{{i.name}}</div> </h2> <h2> <div class="oleo">{{i.name}}</div> </h2><div class="oleo-vsmall">Erstellt am: {{i.kaufdatum}}</div>
</div> </div>
<div class="item item-body"> <div class="item item-body">