Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kollipara Deepak
DigiMart
Commits
f2d4c703
Commit
f2d4c703
authored
Mar 02, 2018
by
mohan122
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added_google_map
parent
867addc7
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
267 additions
and
150 deletions
+267
-150
home/home.html
home/home.html
+152
-146
home/home.ts
home/home.ts
+19
-3
maps/maps.html
maps/maps.html
+28
-0
maps/maps.module.ts
maps/maps.module.ts
+17
-0
maps/maps.scss
maps/maps.scss
+10
-0
maps/maps.ts
maps/maps.ts
+40
-0
register/register.html
register/register.html
+1
-1
No files found.
home/home.html
View file @
f2d4c703
...
...
@@ -17,10 +17,7 @@
</ion-header>
<ion-content>
<ion-item
id=
"password"
style=
"padding:10px;"
>
<ion-label
floating
>
Name of Item
</ion-label>
<ion-input
type=
"text"
#itemname
></ion-input>
</ion-item>
<!--<ion-item *ngFor="let item of listItems">
...
...
@@ -51,150 +48,159 @@
-->
<ion-item
style=
"padding:10px;"
>
<ion-label
floating
>
SELECT-BY
</ion-label>
<ion-select
(ionCancel)=
"cancel()"
>
<ion-option
value=
"Kgs"
(ionSelect)=
"selectItem('Kgs');"
>
Kgs
</ion-option>
<ion-option
value=
"Pieces"
(ionSelect)=
"selectItem('Pieces');"
>
Pieces
</ion-option>
</ion-select>
</ion-item>
<ion-row>
<ion-col
col-9
>
<ion-item
style=
"padding:10px;"
*ngIf=
"isKgsSelected"
>
<ion-label
floating
>
AVAILABLE QUANTITY (IN KGS)
</ion-label>
<ion-input
*ngIf=
"isKgsSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-9
>
<ion-item
style=
"padding-left:10px;"
*ngIf=
"isKgsSelected"
>
<ion-label
floating
*ngIf=
"isKgsSelected"
>
PRICE (PER KG)
</ion-label>
<ion-input
*ngIf=
"isKgsSelected"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<p
*ngIf=
"isPiecesSelected"
style=
"padding:10px;"
>
Note:Weight in Grams
</p>
<ion-row
row-1
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-2
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-3
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-4
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-5
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-6
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<form
[formGroup]=
"registeritems"
>
<ion-item
id=
"password"
style=
"padding:10px;"
>
<ion-label
floating
>
Name of Item
</ion-label>
<ion-input
type=
"text"
#itemname
[formControl]=
"registeritems.controls['nameofitem']"
></ion-input>
</ion-item>
<ion-item
style=
"padding:10px;"
>
<ion-label
floating
>
SELECT-BY
</ion-label>
<ion-select
(ionCancel)=
"cancel()"
>
<ion-option
value=
"Kgs"
(ionSelect)=
"selectItem('Kgs');"
>
KGS
</ion-option>
<ion-option
value=
"Pieces"
(ionSelect)=
"selectItem('Pieces');"
>
PIECES
</ion-option>
</ion-select>
</ion-item>
<ion-item
style=
"padding:10px;"
*ngIf=
"isKgsSelected"
>
<ion-label
floating
>
AVAILABLE QUANTITY (IN KGS)
</ion-label>
<ion-input
*ngIf=
"isKgsSelected"
[formControl]=
"registeritems.controls['aq']"
></ion-input>
</ion-item>
<ion-item
style=
"padding:10px;"
*ngIf=
"isKgsSelected"
>
<ion-label
floating
*ngIf=
"isKgsSelected"
>
PRICE (PER KG)
</ion-label>
<ion-input
*ngIf=
"isKgsSelected"
[formControl]=
"registeritems.controls['price']"
></ion-input>
</ion-item>
<p
*ngIf=
"isPiecesSelected"
style=
"padding:10px;"
>
Note:Weight in Grams
</p>
<ion-row
row-1
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['Weight1']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['pieces1']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['cost1']"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-2
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['Weight2']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['pieces2']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['cost2']"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-3
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['Weight3']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['pieces3']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['cost3']"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-4
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['Weight4']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['pieces4']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['cost4']"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-5
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['Weight5']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['pieces5']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['cost5']"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
<ion-row
row-6
>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
Weight
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['Weight6']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
pieces
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['pieces6']"
></ion-input>
</ion-item>
</ion-col>
<ion-col
col-4
>
<ion-item
style=
"padding:0px;"
*ngIf=
"isPiecesSelected"
>
<ion-label
floating
*ngIf=
"isPiecesSelected"
>
cost
</ion-label>
<ion-input
*ngIf=
"isPiecesSelected"
[formControl]=
"registeritems.controls['cost6']"
></ion-input>
</ion-item>
</ion-col>
</ion-row>
</form>
<div>
<button
ion-button
block
color=
"vamsi"
medium
(click)=
"submit()"
>
Register
</button>
</div>
...
...
home/home.ts
View file @
f2d4c703
...
...
@@ -41,10 +41,26 @@ public isPiecesSelected: boolean;
this
.
registeritems
=
this
.
formBuilder
.
group
({
nameofitem
:[
''
],
cost
:[
''
],
aq
:[
''
],
price
:[
''
],
offers
:[
''
],
pieces
:[
''
],
Weight1
:[
''
],
pieces1
:[
''
],
cost1
:[
''
],
Weight2
:[
''
],
pieces2
:[
''
],
cost2
:[
''
],
Weight3
:[
''
],
pieces3
:[
''
],
cost3
:[
''
],
Weight4
:[
''
],
pieces4
:[
''
],
cost4
:[
''
],
Weight5
:[
''
],
pieces5
:[
''
],
cost5
:[
''
],
Weight6
:[
''
],
pieces6
:[
''
],
cost6
:[
''
],
});
...
...
maps/maps.html
0 → 100644
View file @
f2d4c703
<!--
Generated template for the MapsPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>
<ion-navbar>
<ion-title>
maps
</ion-title>
</ion-navbar>
</ion-header>
<ion-content
padding
>
<ion-item
id=
"password"
style=
"position: relative; padding:0px;"
>
<ion-label
floating
>
LOCATION
</ion-label>
<ion-input
type=
"text"
value=
"{{ location?.coords.latitude}} {{ location?.coords.longitude }}"
readonly
></ion-input>
</ion-item>
<div
padding
>
<button
block
ion-button
color=
"vamsi"
style=
"padding:0px; width: 100%;"
medium
(click)=
"mapUser()"
>
LOCATE ME
</button>
</div>
<agm-map
[latitude]=
" location?.coords.latitude"
[longitude]=
"location?.coords.longitude"
[mapTypeId]=
"'roadmap'"
>
<agm-marker
[latitude]=
" location?.coords.latitude"
[longitude]=
"location?.coords.longitude"
[markerClickable]=
"true"
></agm-marker>
</agm-map>
</ion-content>
\ No newline at end of file
maps/maps.module.ts
0 → 100644
View file @
f2d4c703
import
{
NgModule
}
from
'
@angular/core
'
;
import
{
IonicPageModule
}
from
'
ionic-angular
'
;
import
{
MapsPage
}
from
'
./maps
'
;
import
{
AgmCoreModule
}
from
'
@agm/core
'
;
@
NgModule
({
declarations
:
[
MapsPage
,
],
imports
:
[
IonicPageModule
.
forChild
(
MapsPage
),
AgmCoreModule
.
forRoot
({
apiKey
:
'
AIzaSyDeMjFd459tC-fSBnQ4fLhxHnLxd7b1I5E
'
})
],
})
export
class
MapsPageModule
{}
maps/maps.scss
0 → 100644
View file @
f2d4c703
page-maps
{
#password
{
background
:
color
(
$colors
,
white
);
width
:
95%
;
}
agm-map
{
height
:
300px
;
zoom
:
100%
;
}
}
\ No newline at end of file
maps/maps.ts
0 → 100644
View file @
f2d4c703
import
{
Component
}
from
'
@angular/core
'
;
import
{
IonicPage
,
NavController
,
NavParams
,
Platform
}
from
'
ionic-angular
'
;
import
{
Geolocation
}
from
'
@ionic-native/geolocation
'
;
import
{
AgmCoreModule
}
from
'
@agm/core
'
;
/**
* Generated class for the MapsPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@
IonicPage
()
@
Component
({
selector
:
'
page-maps
'
,
templateUrl
:
'
maps.html
'
,
})
export
class
MapsPage
{
location
:
any
;
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
private
geolocation
:
Geolocation
,
public
platform
:
Platform
)
{
}
mapUser
(){
this
.
platform
.
ready
().
then
(()
=>
{
let
options
=
{
timeout
:
3000
,
enableHighAccuracy
:
true
,
maximumAge
:
0
}
this
.
geolocation
.
getCurrentPosition
(
options
).
then
((
location
)
=>
{
console
.
log
(
'
Fetched the location successfully
'
,
location
);
this
.
location
=
location
;
}).
catch
((
error
)
=>
{
console
.
log
(
'
Error getting location
'
,
error
);
});
});
}
ionViewDidLoad
()
{
console
.
log
(
'
ionViewDidLoad MapsPage
'
);
}
}
register/register.html
View file @
f2d4c703
...
...
@@ -28,7 +28,7 @@
<ion-input
type=
"text"
></ion-input>
</ion-item>
<div
class=
"spacer"
style=
"width: 50px; height: 20px;"
></div>
<ion-item
style=
"padding:0px; width:
285
px
;
"
>
<ion-item
style=
"padding:0px; width:
370
px"
>
<ion-label>
Shop category
</ion-label>
<ion-select
id=
"category"
multiple=
"false"
>
<ion-option>
Kirana
</ion-option>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment