From 4f254274ef7dc5765774ce18a88878e813162650 Mon Sep 17 00:00:00 2001 From: "Hilmer, Carsten" Date: Fri, 9 Sep 2016 13:37:20 +0200 Subject: [PATCH] Detailsseite angepasst, Liste angepasst, Liste klickbar gemacht --- www/css/custom_style.css | 6 ++- www/js/app.js | 3 +- www/pokedex.db | Bin 118784 -> 163840 bytes .../imagedownload/html/imagedownload.html | 2 +- www/templates/imagedownload/js/controllers.js | 2 +- .../pokemonliste/html/pokemon-detail.html | 21 ++++---- .../pokemonliste/html/pokemon-list.html | 21 ++++++-- www/templates/pokemonliste/js/controllers.js | 51 +++++++++++------- www/templates/pokemonliste/js/services.js | 3 +- 9 files changed, 70 insertions(+), 39 deletions(-) diff --git a/www/css/custom_style.css b/www/css/custom_style.css index 3cee560..bebbffe 100644 --- a/www/css/custom_style.css +++ b/www/css/custom_style.css @@ -6,6 +6,10 @@ md-input-container { width: 50%; } +.Width95 { + width: 95%; +} + .itemfontsize{ font-size: 14px; } @@ -118,7 +122,7 @@ md-input-container { background-color: #705848; } /* Typ Stahl */ -.pokemontyp18{ +.pokemontyp17{ background-color: #B8B8D0; } /* Typ Flug */ diff --git a/www/js/app.js b/www/js/app.js index aaf53ad..7ea921e 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -341,7 +341,7 @@ angular.module('starter', ['ionic','ngIOS9UIWebViewPatch','starter.controllers', }) .state('app.pokemonlist', { url: "/pokemonlist", - cache: false, + cache: true, params:{ isAnimated:(ionic.Platform.isAndroid()==false) }, @@ -354,6 +354,7 @@ angular.module('starter', ['ionic','ngIOS9UIWebViewPatch','starter.controllers', }) .state('app.pokemondetail', { url: "/pokemondetail", + cache: false, params: { pokemondetail: null }, diff --git a/www/pokedex.db b/www/pokedex.db index d895d743ccb05c8f3b63ca4bac2de3b198e23927..efcc986e9718feb17ebaa5c18804e1b660de5e19 100644 GIT binary patch delta 3301 zcmZ8kd03TI8vowAZ|8pA*g+OIk`x{4aYV~0R9r(++?NPVO+i5gTyVShx|FztM|(?6 z9ko&u%emEgtf6V1W?D2$Qk2RiL0JTp9b}Ptzwgrg(f2%@=bYbp_w8IZA2n{?YSoGku0i(IsJwAS*1DVB6x%l=*23Gv}whl%Be9S^Dzi1?d@U|8xxFUzr2->W#;#c@sQ4%}L-H#BAV+ z*ZcsU4t;N}$DykN&uvQqc!t|AIQ-4BUXp9%v+{h|DZeYn$sux)toOw9sIvR}TC@W+ zf6^hLCuH#2e*okA@7y$+d;)^py_jchi3W@&77*l`!T2ki0{MZ`Z;537-8)_qE8`RH zHF+tPFn(@h0H0TOnJ5O8*QgY(XBi*9F@%q(@OY^PvpbdWF84|M={U#T7zOM z9rTRf&k5#d>u!;hb2)+hz4~7j?G9HWO?tk!E@-ieG)d31%)$hK}|0pr^CJA~w|jo|u@I`TL)$Q{Z&ogHe}=n&03 zhQ~6=^7waM(Rc|4Gf@j*RgF~wiyAGI0>d&bG<#KLF)Y857(j{P%2MJZy$#zGj62ulDhb$7J`!aW-fp z!q6ZW5sqhYkCY9zgPKc+E1ih}GStTq7#0VYy%OUXHpRgul31JRi`Pd&mluy`cykm` z*759Us8licP{t=``r{|@&_ei`G2MdQDNLLk3*i(H{B9f+dIij3cyv7c228A<0N#Rg zxJEGCIuU*#ZNIDx#q<}UMYZ1*&Tv@*d`+BW`)bCMR|ezcNpPLGqY@#}8)MfnhMOkC zPhP4OjDNTy7}KY~RT7uBA`Isz!B<{!qZp4SVC+;7DzTf=T$d3dBBlX-O!S@(Hp-Ne z*a3|Hv?l_m&48*uwBy*BP)}6DXMw4^o{SXE+0Z}^j+g_DUL`pUW9LGxm+N^7^gJjc zF8#~UqnnE{(K8tyXb82=2fG(_tza0j0Llq8y$Z%|Qj+Yy5ULH#!CY|+O^cKuVbLPR zBc)J$7#>=zhJD{_-NisfjwwrksvKWg3fEOSS17~3r9uHk#F^`lPox3$V>f?k8nhB_ z&ke)2Wl8}m?kAD^JHmu59Xcq;6n!^|lUG8WVu?G1p}0qC0v#a?Ma3>z|) zvc;M#=`R*Ww?8t(hDLh$J;a^ z4w?wKeLXZ7m=ALYFxXp4~6vH(e;d^yIf{C%4;28=j<~Y^h5Mu%pBV7=nWOlY2 zo=`$c=y)bpZ2QvH z;YxhTvrP;O_QAbBEIGNK8b!TGVEFM{pv1Ov#2KDQ3nP| zqGIfO04j)KqbmZV55f&%h;~pfVUI&JtGzj2Ae=G4?RrQEjj? z3_k)T;q0_z*Z4@X!%fW%BnN)FFf%PJe~LEQ$8-U)3=AD2~`qk^63*qR*8aqZ%OtE zawRkFI2?hu^Ffaf&%&pBH|vD%W9SGE)6)ZQmJ5}azrWlrH_LT$wOlTj$T#Kda-qlZ z(r5DYC!IcY9qH83+AouqzOT~KCyAEcqiE^%G%XRmXbE>HKNuWRwj}qo`>rHj%=Y0|+hW#>6x^kmiAf%`qI;0ngR;0N{0PCET~| z7LR*$l}~D|_e^Nf0e`uzvLI~hpdUDVf2gMjHLm7tJp%Y{2y%NDT2m>5$ zh2L?O1xj$8nRW+Fa0@>$LL=rIpdCNgLj(S-gK{j=5?`GLO398$hZHZ#gYD0=7~2r5 zpJjwO#Wd5HYsk>Qulq!MQPZR`KrbmiFD?WFros(;I*AmIo&pbX`DD0;fr(Io{U(v* zxe4⪼Q9p379z%E{W6$U3p6u568U@og!{KH7SnX z1|7I&D_j&QTWE@lac&3(5u;3WT;hapamXgPh>JGDWlY~din7;3t5}dj^@|(ULAhAB z7PNr-*T7vxeWhe?v1@HD)-LNP%U{f+O@ocGh6Mc>-Ae5-O+NfARpvSWjgA9wABVm} zIUV^nG~r4l;fHDBinsPFCY{+w*Pn1`5l8ldKcL?ps1mT7VvS>V!55gYlT3)qrD>0o zc0i+uSDuS~V2Fs8?45RltzI#*2PtG2oeNE%LN58NJx}2$^>ti8J8GpatceuOW8P# zBYeea2201WrlEAKHQvdI)W&M!VmiX80bXDgaJj~9xp($QGkr7f%=ex-=XuWaobwhJ zOU0+O$E}uVl}csf^WXPQ>7u3cqE!*CAx6Itm4rzuxkPrD9MV0F#b*MOjFHk}zY=G( z`8RN$@u>r6ndAm%p?1DnV>qEIC@sx(CaE`obFZNqWCkspnV1M4CBC~oJAbEgMH9?t zp?ok+(t6{E7ydtPb$+fffYV{Bu>|O3t4i*c&&k>H0r?9#QMSsBOsbZh*2P6XP(&}> z6#hLR0mXE~Jtf^`p{y>rP3dl!q@2gluGrembhr~-bg}~)>0CSXQ_CZ`LFz~FH-$fh zJ4$AknH(88O$rYRVs<&$t*NgK3? zWfK6PY#ov)Y8(cY&BGQ-8G~jebwp1IqcEzh^O$La2U?YcQ9TunK#dYOW~S4_P*3NF z;DMk)m<8h4080@2{{a~k&9sG-esEuaP7ojTfey$fV;jvi;S{YfVmtlh17^xFpo`A> zfE*Hm#U>}tvF+!XTH9!@~OqDzb zyF`!`?Le!7nd?{z=qZ0T^XH~AcFrsurIMLgFWwIF0%fH!&G&(Li7o_i-*x`jQI!tw zL%BcJk#+|5(tHc|m2Ac)(H4m|5Z5Cx0K}z5XaTBy3I|1XILbhOhH-iQlQ==QLUDvb zHZ!h16l+E2LYxJp-^%x?C(vEB4I~u33(yBh-oZgwfOkdbJTw7~*xA1@J6>2b>&0Am*o~IFj znhQWLt}VyeP*n&zq+83_-o_YCy1x{M>CqA#qvqXQJ$nhWIHDQ$$a`$n$|#(qIqP}2 zMMZoKTgL+T?qR;TG;9&}wKxMP^aX~AOl42ErQl!m*&3{=Duz8kcb~^9iaN;5my^*5 z;zSY#gZTJ43Gd0tUL0$bTuHa04|7JUh=8@Ls7LAvuDD~;cdm&L$7c8YxWVK-Htg(VPCS{nBCd9eQr`uya- diff --git a/www/templates/imagedownload/html/imagedownload.html b/www/templates/imagedownload/html/imagedownload.html index 9dda734..b9ce679 100644 --- a/www/templates/imagedownload/html/imagedownload.html +++ b/www/templates/imagedownload/html/imagedownload.html @@ -16,7 +16,7 @@ - +
{{ progressprozent }} %
Aktuelle Datei: {{ currentfile }}

diff --git a/www/templates/imagedownload/js/controllers.js b/www/templates/imagedownload/js/controllers.js index 47819d5..316fee6 100644 --- a/www/templates/imagedownload/js/controllers.js +++ b/www/templates/imagedownload/js/controllers.js @@ -15,7 +15,7 @@ // Controller of Contract List Page. appControllers.controller('imageDownloadCtrl', function ($scope, $stateParams, $mdBottomSheet, $timeout, $mdDialog, $cordovaFileTransfer, $cordovaFile, $state, pokedexDB) { - $scope.progressval = 0; + $scope.progressval = 0; $scope.currentfile = ''; $scope.progressprozent = 0; $scope.DownloadisVisible=true; diff --git a/www/templates/pokemonliste/html/pokemon-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html index 0954e20..ffef44f 100644 --- a/www/templates/pokemonliste/html/pokemon-detail.html +++ b/www/templates/pokemonliste/html/pokemon-detail.html @@ -48,20 +48,20 @@

Entw. ab:
-
{{pokemon.pokemonentwicklungtext}} {{pokemon.pokemonname}}-Bonbons
+
{{pokemon.pokemonentwicklungtext}} Bonbons
-
+
PokemonTyp {{ pokemon.pokemontypaString }}
-
+
PokemonTyp {{ pokemon.pokemontypbString }}
@@ -80,23 +80,21 @@
Entwicklung
-
-
+
-
- -
+
+
+

{{ pokemonentwicklung.pokemonpokedexid }} Bonbons

Pokedex-ID: {{ pokemonentwicklung.pokemonpokedexid }}

-
- +
+
-
@@ -154,6 +152,7 @@ Hinweis: Angriffe durch Starke Attacken (
) sollten vermieden werden.
+
diff --git a/www/templates/pokemonliste/html/pokemon-list.html b/www/templates/pokemonliste/html/pokemon-list.html index 4509f48..87e4e79 100644 --- a/www/templates/pokemonliste/html/pokemon-list.html +++ b/www/templates/pokemonliste/html/pokemon-list.html @@ -19,7 +19,7 @@
- +
@@ -29,9 +29,8 @@ - -
@@ -98,17 +97,29 @@
+
+

{{ pokemon.pokemonname }}

Pokedex-Id: {{ pokemon.pokedexidString }}
-
+
+
+
+
+
PokemonTyp {{ pokemon.pokemontypaString }}
-
+
+
+
PokemonTyp {{ pokemon.pokemontypbString }}
+
+ + +
diff --git a/www/templates/pokemonliste/js/controllers.js b/www/templates/pokemonliste/js/controllers.js index 42964dc..bf9df00 100644 --- a/www/templates/pokemonliste/js/controllers.js +++ b/www/templates/pokemonliste/js/controllers.js @@ -13,7 +13,7 @@ // http://ngcordova.com/docs/plugins/sqlite/ // // Controller of Pokemon List Page. -appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, pokedexDB) { +appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$ionicScrollDelegate, $filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, pokedexDB) { // initialForm is the first activity in the controller. // It will initial all variable data and let the function works when page load. @@ -50,7 +50,7 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$fil jQuery('#pokemon-list-loading-progress').hide(); jQuery('#pokemon-list-content').fadeIn(); $scope.isLoading = false; - }, 3000);// End loading progress. + }, 1000);// End loading progress. };// End initialForm. @@ -67,6 +67,16 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$fil $scope.pokemons = pokedexDB.all(); };//End getPokemonList. + + //Scroll Trefferliste nach oben + //Wenn filtereingaben getÃĪtigt werden + $scope.scrollTop = function() { + if ($scope.filterText.length > 2){ + $ionicScrollDelegate.scrollTop(); + } + }; + + // navigateTo is for navigate to other page // by using targetPage to be the destination page // and sending objectData to the destination page. @@ -81,7 +91,10 @@ appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$fil },400); };// End navigateTo. - $scope.initialForm(); + $scope.$on('$ionicView.loaded', function(viewInfo, state){ + console.log('CTRL - $ionicView.loaded', viewInfo, state); + $scope.initialForm(); + }); });// End of Pokemon List Page Controller. @@ -99,29 +112,31 @@ appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToas // Parameter : // $stateParams.pokemondetail(object) = pokemon that user select from pokemon list page. $scope.pokemon = $scope.getPokemonData($stateParams.pokemondetail); + console.debug($scope.pokemon); + var entwarr = $scope.pokemon.pokemonentwicklung.split("|"); var entwkostenarr=$scope.pokemon.pokemonentwicklungkosten.split("|"); - var index; - for (index = 0; index < entwarr.length; ++index) { + if (entwarr!=''){ + var index; + for (index = 0; index < entwarr.length; ++index) { - - var dataItemEntwicklung = { - pokemonpokedexid : entwarr[index] , - pokemonimage : $scope.getPokemonImage(entwarr[index]), - pokemonlistentyp : 1 - }; - $scope.pokemonentwicklungliste.push(dataItemEntwicklung); - - if (entwkostenarr[index]>0){ var dataItemEntwicklung = { - pokemonpokedexid : entwkostenarr[index] , - pokemonlistentyp : 2 + pokemonpokedexid : entwarr[index] , + pokemonimage : $scope.getPokemonImage(entwarr[index]), + pokemonlistentyp : 1 }; $scope.pokemonentwicklungliste.push(dataItemEntwicklung); - } - } + if (entwkostenarr[index]>0){ + var dataItemEntwicklung = { + pokemonpokedexid : entwkostenarr[index] , + pokemonlistentyp : 2 + }; + $scope.pokemonentwicklungliste.push(dataItemEntwicklung); + } + } + } //$scope.actionDelete is the variable for allow or not allow to delete data. // It will allow to delete data when have data in the database. $timeout(function () { diff --git a/www/templates/pokemonliste/js/services.js b/www/templates/pokemonliste/js/services.js index 4b6ad6c..03b04ff 100644 --- a/www/templates/pokemonliste/js/services.js +++ b/www/templates/pokemonliste/js/services.js @@ -50,7 +50,8 @@ appServices.factory('pokedexDB', function ($cordovaSQLite) pokemonList = []; pokemontypen = []; pokemonfundorte = []; - + pokemonimages = []; + //Typen einlesen var query = "SELECT * FROM tblPokemonTyp order by ID ASC"; $cordovaSQLite.execute(db, query).then(function (res)