Liebeszitat Vorschläge eingebaut.
This commit is contained in:
parent
e6a9f2e68f
commit
fc1cc51ac4
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
14
platforms/android/.idea/workspace.xml
generated
14
platforms/android/.idea/workspace.xml
generated
@ -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.51182795">
|
<state vertical-scroll-proportion="0.3419355">
|
||||||
<caret line="79" column="28" selection-start-line="79" selection-start-column="28" selection-end-line="79" selection-end-column="28" />
|
<caret line="75" column="47" selection-start-line="75" selection-start-column="47" selection-end-line="75" selection-end-column="47" />
|
||||||
<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="390" column="0" selection-start-line="390" selection-start-column="0" selection-end-line="390" selection-end-column="0" />
|
<caret line="416" column="0" selection-start-line="416" selection-start-column="0" selection-end-line="416" 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="5817794082175" />
|
<entry key="$PROJECT_DIR$" value="5817799017023" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
<option name="projectBuildClasspath">
|
<option name="projectBuildClasspath">
|
||||||
@ -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="390" column="0" selection-start-line="390" selection-start-column="0" selection-end-line="390" selection-end-column="0" />
|
<caret line="416" column="0" selection-start-line="416" selection-start-column="0" selection-end-line="416" 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.51182795">
|
<state vertical-scroll-proportion="0.3419355">
|
||||||
<caret line="79" column="28" selection-start-line="79" selection-start-column="28" selection-end-line="79" selection-end-column="28" />
|
<caret line="75" column="47" selection-start-line="75" selection-start-column="47" selection-end-line="75" selection-end-column="47" />
|
||||||
<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" />
|
||||||
|
|||||||
Binary file not shown.
@ -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) {
|
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) {
|
||||||
|
|
||||||
$scope.preis="";
|
$scope.preis="";
|
||||||
$scope.name="";
|
$scope.name="";
|
||||||
@ -37,6 +37,8 @@ angular.module('starter.controllers', [])
|
|||||||
$scope.showrosen = false;
|
$scope.showrosen = false;
|
||||||
$scope.showflatrate = true;
|
$scope.showflatrate = true;
|
||||||
|
|
||||||
|
$scope.zitat='';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.show = function() {
|
$scope.show = function() {
|
||||||
@ -72,6 +74,29 @@ $scope.show = function() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
$scope.loadzitat = function() {
|
||||||
|
|
||||||
|
$http({
|
||||||
|
url: 'http://api.raataar.de/sapientia-web/sapientia-zitationic/67557103d3658523fa63ff3dcd46d8ec/zitat',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json"
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.success(function(response) {
|
||||||
|
$scope.zitat = response;
|
||||||
|
$scope.freitext='"' + response.zitat_text + '"';
|
||||||
|
})
|
||||||
|
.error(function(response) {
|
||||||
|
alert("Fehler! Besteht eine Verbindung zum Internet?");
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Produkt-Details abrufen START
|
* Produkt-Details abrufen START
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe?</button>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe? (Zufallstext)</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -55,7 +55,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -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) {
|
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) {
|
||||||
|
|
||||||
$scope.preis="";
|
$scope.preis="";
|
||||||
$scope.name="";
|
$scope.name="";
|
||||||
@ -37,6 +37,8 @@ angular.module('starter.controllers', [])
|
|||||||
$scope.showrosen = false;
|
$scope.showrosen = false;
|
||||||
$scope.showflatrate = true;
|
$scope.showflatrate = true;
|
||||||
|
|
||||||
|
$scope.zitat='';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.show = function() {
|
$scope.show = function() {
|
||||||
@ -72,6 +74,29 @@ $scope.show = function() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
$scope.loadzitat = function() {
|
||||||
|
|
||||||
|
$http({
|
||||||
|
url: 'http://api.raataar.de/sapientia-web/sapientia-zitationic/67557103d3658523fa63ff3dcd46d8ec/zitat',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json"
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.success(function(response) {
|
||||||
|
$scope.zitat = response;
|
||||||
|
$scope.freitext='"' + response.zitat_text + '"';
|
||||||
|
})
|
||||||
|
.error(function(response) {
|
||||||
|
alert("Fehler! Besteht eine Verbindung zum Internet?");
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Produkt-Details abrufen START
|
* Produkt-Details abrufen START
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe?</button>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe? (Zufallstext)</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -55,7 +55,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -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) {
|
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) {
|
||||||
|
|
||||||
$scope.preis="";
|
$scope.preis="";
|
||||||
$scope.name="";
|
$scope.name="";
|
||||||
@ -37,6 +37,8 @@ angular.module('starter.controllers', [])
|
|||||||
$scope.showrosen = false;
|
$scope.showrosen = false;
|
||||||
$scope.showflatrate = true;
|
$scope.showflatrate = true;
|
||||||
|
|
||||||
|
$scope.zitat='';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.show = function() {
|
$scope.show = function() {
|
||||||
@ -67,10 +69,34 @@ $scope.show = function() {
|
|||||||
$scope.resetflat = function() {
|
$scope.resetflat = function() {
|
||||||
inappbilling.consumePurchase(function(result) {}, function(result) {}, 'rosenflatrate');
|
inappbilling.consumePurchase(function(result) {}, function(result) {}, 'rosenflatrate');
|
||||||
$rootScope.flatrate=0;
|
$rootScope.flatrate=0;
|
||||||
|
$scope.showflatrate = true;
|
||||||
$timeout(getProducts, 1000);
|
$timeout(getProducts, 1000);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
$scope.loadzitat = function() {
|
||||||
|
|
||||||
|
$http({
|
||||||
|
url: 'http://api.raataar.de/sapientia-web/sapientia-zitationic/67557103d3658523fa63ff3dcd46d8ec/zitat',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json"
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.success(function(response) {
|
||||||
|
$scope.zitat = response;
|
||||||
|
$scope.freitext='"' + response.zitat_text + '"';
|
||||||
|
})
|
||||||
|
.error(function(response) {
|
||||||
|
alert("Fehler! Besteht eine Verbindung zum Internet?");
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Produkt-Details abrufen START
|
* Produkt-Details abrufen START
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe?</button>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe? (Zufallstext)</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -55,7 +55,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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:11:41 CET 2016.<br/>
|
Check performed at Wed Feb 03 09:53:46 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>
|
||||||
|
|||||||
@ -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) {
|
.controller('DashCtrl', function($scope,$ionicPopup,$http, $database, $timeout,$rootScope, $cordovaFileTransfer,$cordovaFile,$ionicLoading,$state,$http) {
|
||||||
|
|
||||||
$scope.preis="";
|
$scope.preis="";
|
||||||
$scope.name="";
|
$scope.name="";
|
||||||
@ -37,6 +37,8 @@ angular.module('starter.controllers', [])
|
|||||||
$scope.showrosen = false;
|
$scope.showrosen = false;
|
||||||
$scope.showflatrate = true;
|
$scope.showflatrate = true;
|
||||||
|
|
||||||
|
$scope.zitat='';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.show = function() {
|
$scope.show = function() {
|
||||||
@ -72,6 +74,29 @@ $scope.show = function() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
$scope.loadzitat = function() {
|
||||||
|
|
||||||
|
$http({
|
||||||
|
url: 'http://api.raataar.de/sapientia-web/sapientia-zitationic/67557103d3658523fa63ff3dcd46d8ec/zitat',
|
||||||
|
dataType: 'json',
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json"
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.success(function(response) {
|
||||||
|
$scope.zitat = response;
|
||||||
|
$scope.freitext='"' + response.zitat_text + '"';
|
||||||
|
})
|
||||||
|
.error(function(response) {
|
||||||
|
alert("Fehler! Besteht eine Verbindung zum Internet?");
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Produkt-Details abrufen START
|
* Produkt-Details abrufen START
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe?</button>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-android-hangout button-custom" ng-click="loadzitat()">kleine Hilfe? (Zufallstext)</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -55,7 +55,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
<div class="col col-100"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="resetflat()">Reset Flatrate</button></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user