Raataar/Wolle-Rosen-Kaufen
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Selectbox auswahl gefixt.

Browse Source
This commit is contained in:
Carsten Hilmer 2016-02-04 14:01:30 +01:00
parent 3729b6cf63
commit e0500a55fc
22 changed files with 72 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
View File

Binary file not shown.

14
platforms/android/.idea/workspace.xml generated
View File

@ -41,8 +41,8 @@
<file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.59384614">
<caret line="77" column="52" selection-start-line="77" selection-start-column="52" selection-end-line="77" selection-end-column="52" />
<state vertical-scroll-proportion="0.3846154">
<caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" />
<folding>
<element signature="e#0#38645#0" expanded="false" />
<element signature="imports" expanded="false" />
@ -66,7 +66,7 @@
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="532" column="0" selection-start-line="532" selection-start-column="0" selection-end-line="532" selection-end-column="0" />
<caret line="531" column="0" selection-start-line="531" selection-start-column="0" selection-end-line="531" selection-end-column="0" />
<folding />
</state>
</provider>
@ -1264,7 +1264,7 @@
</option>
<option name="modificationStamps">
<map>
<entry key="$PROJECT_DIR$" value="5817982802969" />
<entry key="$PROJECT_DIR$" value="5817990975559" />
</map>
</option>
<option name="projectBuildClasspath">
@ -1938,7 +1938,7 @@
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="532" column="0" selection-start-line="532" selection-start-column="0" selection-end-line="532" selection-end-column="0" />
<caret line="531" column="0" selection-start-line="531" selection-start-column="0" selection-end-line="531" selection-end-column="0" />
<folding />
</state>
</provider>
@ -1961,8 +1961,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.59384614">
<caret line="77" column="52" selection-start-line="77" selection-start-column="52" selection-end-line="77" selection-end-column="52" />
<state vertical-scroll-proportion="0.3846154">
<caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" />
<folding>
<element signature="e#0#38645#0" expanded="false" />
<element signature="imports" expanded="false" />

BIN
platforms/android/android-release.apk
View File

Binary file not shown.

27
platforms/android/assets/www/js/controllers.js
View File

@ -11,16 +11,16 @@ angular.module('starter.controllers', [])
$scope.backgroundpic = "1";
$scope.backgrounds = [
{ name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"},
{ name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"},
{ name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"},
{ name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
];
@ -69,7 +69,6 @@ $scope.show = function() {
$scope.validate = function() {
var link = 'http://api.raataar.de/rosen/vorschau.php';
$http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
$scope.response = res.data;
@ -111,9 +110,9 @@ $scope.show = function() {
*/
//Getter für Selectbox
$scope.getBackgroundOpt = function(option){
$scope.backgroundpic=option.backvalue;
return option.backvalue;
$scope.getBackgroundOpt = function(newValuea, oldValue){
$scope.backgroundpic=newValuea.backvalue;
// return newValuea.backvalue;
};
//Flatrate resetten DEBUGGING

6
platforms/android/assets/www/templates/tab-dash.html
View File

@ -47,8 +47,8 @@
</div>
<div style="padding-bottom:15px;">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + backgroundpic || 'Hintergrund'}}
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option">
<h2>{{option.name}}</h2>
<p>{{option.beschreibung}}</p>
@ -60,7 +60,7 @@
<div class="item item-divider oleo">Rosen jetzt kaufen?</div>
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-disabled="!$parent.preis || !$parent.name || !$parent.freitext" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-social-euro button-custom" ng-disabled="!$parent.preis || !$parent.freitext || !$parent.name" ng-click="buyRose()">Jetzt Kaufen</button></div>
</div>

27
platforms/android/build/intermediates/assets/debug/www/js/controllers.js
View File

@ -11,16 +11,16 @@ angular.module('starter.controllers', [])
$scope.backgroundpic = "1";
$scope.backgrounds = [
{ name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"},
{ name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"},
{ name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"},
{ name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
];
@ -69,7 +69,6 @@ $scope.show = function() {
$scope.validate = function() {
var link = 'http://api.raataar.de/rosen/vorschau.php';
$http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
$scope.response = res.data;
@ -111,9 +110,9 @@ $scope.show = function() {
*/
//Getter für Selectbox
$scope.getBackgroundOpt = function(option){
$scope.backgroundpic=option.backvalue;
return option.backvalue;
$scope.getBackgroundOpt = function(newValuea, oldValue){
$scope.backgroundpic=newValuea.backvalue;
// return newValuea.backvalue;
};
//Flatrate resetten DEBUGGING

6
platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html
View File

@ -47,8 +47,8 @@
</div>
<div style="padding-bottom:15px;">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + backgroundpic || 'Hintergrund'}}
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option">
<h2>{{option.name}}</h2>
<p>{{option.beschreibung}}</p>
@ -60,7 +60,7 @@
<div class="item item-divider oleo">Rosen jetzt kaufen?</div>
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-disabled="!$parent.preis || !$parent.name || !$parent.freitext" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-social-euro button-custom" ng-disabled="!$parent.preis || !$parent.freitext || !$parent.name" ng-click="buyRose()">Jetzt Kaufen</button></div>
</div>

27
platforms/android/build/intermediates/assets/release/www/js/controllers.js
View File

@ -11,16 +11,16 @@ angular.module('starter.controllers', [])
$scope.backgroundpic = "1";
$scope.backgrounds = [
{ name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"},
{ name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"},
{ name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"},
{ name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
];
@ -69,7 +69,6 @@ $scope.show = function() {
$scope.validate = function() {
var link = 'http://api.raataar.de/rosen/vorschau.php';
$http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
$scope.response = res.data;
@ -111,9 +110,9 @@ $scope.show = function() {
*/
//Getter für Selectbox
$scope.getBackgroundOpt = function(option){
$scope.backgroundpic=option.backvalue;
return option.backvalue;
$scope.getBackgroundOpt = function(newValuea, oldValue){
$scope.backgroundpic=newValuea.backvalue;
// return newValuea.backvalue;
};
//Flatrate resetten DEBUGGING

6
platforms/android/build/intermediates/assets/release/www/templates/tab-dash.html
View File

@ -47,8 +47,8 @@
</div>
<div style="padding-bottom:15px;">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + backgroundpic || 'Hintergrund'}}
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option">
<h2>{{option.name}}</h2>
<p>{{option.beschreibung}}</p>
@ -60,7 +60,7 @@
<div class="item item-divider oleo">Rosen jetzt kaufen?</div>
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-disabled="!$parent.preis || !$parent.name || !$parent.freitext" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-social-euro button-custom" ng-disabled="!$parent.preis || !$parent.freitext || !$parent.name" ng-click="buyRose()">Jetzt Kaufen</button></div>
</div>

BIN
platforms/android/build/intermediates/gradle_project_sync_data.bin
View File

Binary file not shown.

BIN
platforms/android/build/intermediates/res/resources-debug.ap_
View File

Binary file not shown.

BIN
platforms/android/build/intermediates/res/resources-release.ap_
View File

Binary file not shown.

BIN
platforms/android/build/outputs/apk/android-debug-unaligned.apk
View File

Binary file not shown.

BIN
platforms/android/build/outputs/apk/android-debug.apk
View File

Binary file not shown.

BIN
platforms/android/build/outputs/apk/android-release-unaligned.apk
View File

Binary file not shown.

2
platforms/android/build/outputs/lint-results-release-fatal.html
View File

@ -18,7 +18,7 @@ document.getElementById(id+'Link').style.display = 'none';
<body>
<h1>Lint Report</h1>
<div class="titleSeparator"></div>
Check performed at Thu Feb 04 11:24:33 CET 2016.<br/>
Check performed at Thu Feb 04 12:34:51 CET 2016.<br/>
6 errors and 0 warnings found:<br/><br/>
<table class="overview">
<tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a>

27
www/js/controllers.js
View File

@ -11,16 +11,16 @@ angular.module('starter.controllers', [])
$scope.backgroundpic = "1";
$scope.backgrounds = [
{ name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen und Tiere"},
{ name : "Hintergrund 2", backvalue : "2", beschreibung: "geflügeltes Herz"},
{ name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ name : "Hintergrund 8", backvalue : "8", beschreibung: "Hände die sich halten"},
{ name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
{ id: "1", name : "Hintergrund 1", backvalue : "1", beschreibung: "Herzen nit Tieren"},
{ id: "2", name : "Hintergrund 2", backvalue : "2", beschreibung: "EngelHerz"},
{ id: "3", name : "Hintergrund 3", backvalue : "3", beschreibung: "Herzenmuster"},
{ id: "4", name : "Hintergrund 4", backvalue : "4", beschreibung: "Herzpflanzen"},
{ id: "5", name : "Hintergrund 5", backvalue : "5", beschreibung: "Neutral dunkel"},
{ id: "6", name : "Hintergrund 6", backvalue : "6", beschreibung: "Springendes Paar"},
{ id: "7", name : "Hintergrund 7", backvalue : "7", beschreibung: "Herzen mit Verzierung"},
{ id: "8", name : "Hintergrund 8", backvalue : "8", beschreibung: "Hand in Hand"},
{ id: "9", name : "Hintergrund 9", backvalue : "9", beschreibung: "Stoffmuster"},
{ id: "10", name : "Hintergrund 10", backvalue : "10", beschreibung: "Ballons mit Herzen"},
];
@ -69,7 +69,6 @@ $scope.show = function() {
$scope.validate = function() {
var link = 'http://api.raataar.de/rosen/vorschau.php';
$http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis, bg: $scope.backgroundpic}).then(function (res){
$scope.response = res.data;
@ -111,9 +110,9 @@ $scope.show = function() {
*/
//Getter für Selectbox
$scope.getBackgroundOpt = function(option){
$scope.backgroundpic=option.backvalue;
return option.backvalue;
$scope.getBackgroundOpt = function(newValuea, oldValue){
$scope.backgroundpic=newValuea.backvalue;
// return newValuea.backvalue;
};
//Flatrate resetten DEBUGGING

6
www/templates/tab-dash.html
View File

@ -47,8 +47,8 @@
</div>
<div style="padding-bottom:15px;">
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" option-getter="getBackgroundOpt(option)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + backgroundpic || 'Hintergrund'}}
<button class="button button-full button-custom" modal-select="" ng-model="backgroundpic" options="backgrounds" on-select="getBackgroundOpt(newValue, oldValue)" modal-title="Hintergrund wählen">
{{ 'Hintergrund: ' + $parent.backgroundpic || 'Hintergrund'}}
<div class="option">
<h2>{{option.name}}</h2>
<p>{{option.beschreibung}}</p>
@ -60,7 +60,7 @@
<div class="item item-divider oleo">Rosen jetzt kaufen?</div>
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-disabled="!$parent.preis || !$parent.name || !$parent.freitext" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-click="validate()">Vorschau</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-social-euro button-custom" ng-disabled="!$parent.preis || !$parent.freitext || !$parent.name" ng-click="buyRose()">Jetzt Kaufen</button></div>
</div>