Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
DigiMart
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KLUGLUG
DigiMart
Commits
5b9306e3
Commit
5b9306e3
authored
Mar 04, 2018
by
mohan122
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added_google_map
parent
f2d4c703
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
213 additions
and
139 deletions
+213
-139
home/home.html
home/home.html
+136
-134
home/home.scss
home/home.scss
+3
-0
maps/maps.html
maps/maps.html
+7
-2
maps/maps.scss
maps/maps.scss
+8
-2
maps/maps.ts
maps/maps.ts
+54
-0
plogin/plogin.html
plogin/plogin.html
+1
-1
plogin/plogin.ts
plogin/plogin.ts
+4
-0
No files found.
home/home.html
View file @
5b9306e3
...
...
@@ -63,141 +63,143 @@
</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>
<div
class=
"bg"
>
<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>
</div>
</form>
<div>
<button
ion-button
block
color=
"vamsi"
medium
(click)=
"submit()"
>
Register
</button>
</div>
...
...
home/home.scss
View file @
5b9306e3
...
...
@@ -2,4 +2,7 @@ page-home {
#BUTON
{
background
:
color
(
$colors
,
vamsi
);
}
.bg
{
background
:
color
(
$colors
,
vamsi
);
}
}
\ No newline at end of file
maps/maps.html
View file @
5b9306e3
...
...
@@ -14,15 +14,20 @@
<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
[disableDefaultUI]=
"true"
[latitude]=
"location?.coords.latitude"
[streetViewControl]=
"true"
[longitude]=
"location?.coords.longitude"
[mapTypeId]=
"'roadmap'"
[zoom]=
"15"
>
<agm-marker
[label]=
"location.title"
[latitude]=
" location?.coords.latitude"
[longitude]=
"location?.coords.longitude"
[markerClickable]=
"true"
></agm-marker>
</agm-map>
<div
id=
map
></div>
</ion-content>
\ No newline at end of file
maps/maps.scss
View file @
5b9306e3
...
...
@@ -4,7 +4,13 @@ page-maps {
width
:
95%
;
}
agm-map
{
height
:
300px
;
zoom
:
100%
;
height
:
400px
;
width
:
320px
;
position
:
absolute
;
left
:
0
;
bottom
:
5
;
}
map
{
height
:
400px
;
}
}
\ No newline at end of file
maps/maps.ts
View file @
5b9306e3
...
...
@@ -2,6 +2,15 @@ import { Component } from '@angular/core';
import
{
IonicPage
,
NavController
,
NavParams
,
Platform
}
from
'
ionic-angular
'
;
import
{
Geolocation
}
from
'
@ionic-native/geolocation
'
;
import
{
AgmCoreModule
}
from
'
@agm/core
'
;
/*import {
GoogleMaps,
GoogleMap,
GoogleMapsEvent,
GoogleMapOptions,
CameraPosition,
MarkerOptions,
Marker
} from '@ionic-native/google-maps';*/
/**
* Generated class for the MapsPage page.
...
...
@@ -10,6 +19,7 @@ import { AgmCoreModule } from '@agm/core';
* Ionic pages and navigation.
*/
@
IonicPage
()
@
Component
({
selector
:
'
page-maps
'
,
...
...
@@ -18,9 +28,52 @@ import { AgmCoreModule } from '@agm/core';
export
class
MapsPage
{
location
:
any
;
// map: GoogleMap;
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
private
geolocation
:
Geolocation
,
public
platform
:
Platform
)
{
}
/*loadMap() {
let mapOptions: GoogleMapOptions = {
camera: {
target: {
lat: 43.0741904,
lng: -89.3809802
},
zoom: 18,
tilt: 30
}
};
this.map = GoogleMaps.create('map_canvas', mapOptions);
// Wait the MAP_READY before using any methods.
this.map.one(GoogleMapsEvent.MAP_READY)
.then(() => {
console.log('Map is ready!');
// Now you can use all methods safely.
this.map.addMarker({
title: 'Ionic',
icon: 'blue',
animation: 'DROP',
position: {
lat: 43.0741904,
lng: -89.3809802
}
})
.then(marker => {
marker.on(GoogleMapsEvent.MARKER_CLICK)
.subscribe(() => {
alert('clicked');
});
});
});
}*/
mapUser
(){
this
.
platform
.
ready
().
then
(()
=>
{
let
options
=
{
timeout
:
3000
,
enableHighAccuracy
:
true
,
maximumAge
:
0
}
...
...
@@ -35,6 +88,7 @@ this.geolocation.getCurrentPosition(options).then((location) => {
ionViewDidLoad
()
{
console
.
log
(
'
ionViewDidLoad MapsPage
'
);
//this.loadMap();
}
}
plogin/plogin.html
View file @
5b9306e3
...
...
@@ -33,7 +33,7 @@
</ion-item>
</ion-list>
<div
padding
>
<button
block
ion-button
color=
"vamsi"
style=
"padding:0px; width: 100%;"
medium
>
Sign In
</button>
<button
block
ion-button
color=
"vamsi"
style=
"padding:0px; width: 100%;"
medium
(click)=
"Map()"
>
Sign In
</button>
<div
class=
"spacer"
style=
"width: 50px; height: 10px;"
></div>
<button
block
ion-button
color=
"light"
medium
(click)=
"Register()"
>
Register
</button>
</div>
...
...
plogin/plogin.ts
View file @
5b9306e3
import
{
Component
}
from
'
@angular/core
'
;
import
{
IonicPage
,
NavController
,
NavParams
}
from
'
ionic-angular
'
;
import
{
RegisterPage
}
from
'
../register/register
'
;
import
{
MapsPage
}
from
'
../maps/maps
'
;
/**
* Generated class for the PloginPage page.
...
...
@@ -20,6 +21,9 @@ export class PloginPage {
}
Register
()
{
this
.
navCtrl
.
push
(
RegisterPage
);
}
Map
()
{
this
.
navCtrl
.
setRoot
(
MapsPage
);
}
ionViewDidLoad
()
{
console
.
log
(
'
ionViewDidLoad PloginPage
'
);
...
...
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