verdnatura/vn-picture
verdnatura
/
vn-picture
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

errors solved

This commit is contained in:
quique 2019-09-25 09:11:34 +02:00
parent eaba29185a
commit 6ff1c56343
15 changed files with 72 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platforms/android/android.iml
View File

@ -12,9 +12,8 @@
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content> </content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

BIN
platforms/android/app/release/app-release.apk Normal file
View File

Binary file not shown.

BIN
platforms/android/app/release/picture.apk → platforms/android/app/release/vn-picture.apk
View File

Binary file not shown.

46
platforms/android/app/src/main/assets/www/css/index.css
View File

@ -32,6 +32,8 @@ html{
} }
body { body {
background: #fff;
padding: 20px;
-webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */ -webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */
-webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */ -webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */
-webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */ -webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */
@ -41,7 +43,7 @@ body {
font-size:12px; font-size:12px;
margin:0px; margin:0px;
padding:0px;
color: #fff; color: #fff;
@ -56,6 +58,10 @@ p{
.contentPhoto{ .contentPhoto{
width: 100%; width: 100%;
padding: 25px 0px; padding: 25px 0px;
margin-top: 24px;
}
.blackground{
background: #242424;
} }
#photo{ #photo{
max-width: 100%; max-width: 100%;
@ -84,7 +90,7 @@ p{
background: #000; background: #000;
height: 50px; height: 50px;
padding: 5px 0; padding: 5px 0;
left: 0;
} }
.btnmin{ .btnmin{
float: left; float: left;
@ -113,6 +119,7 @@ p{
display: block; display: block;
width: 80px; width: 80px;
margin-top: 50px; margin-top: 50px;
margin-bottom: 50px;
} }
h1{ h1{
color: #fff; color: #fff;
@ -150,18 +157,11 @@ spam{
z-index: 999; z-index: 999;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(247,120,36,1); background: #fff;
background: -moz-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: -webkit-gradient(left bottom, right top, color-stop(0%, rgba(247,120,36,1)), color-stop(23%, rgba(247,120,36,1)), color-stop(100%, rgba(250,217,97,1)));
background: -webkit-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: -o-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: -ms-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f77824', endColorstr='#fad961', GradientType=1 );
} }
.btnbarcode{ .btnbarcode{
margin-bottom: 10px; margin-bottom: 10px;
background-color: rgba(0,0,0,.150); background-color: #D4D2D4;
background-image: url(../img/barcode.png); background-image: url(../img/barcode.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 25px; background-size: 25px;
@ -169,14 +169,14 @@ spam{
background-position-x: 10px; background-position-x: 10px;
width: 100%; width: 100%;
height: 50px; height: 50px;
border-radius: 15px; border-radius: 26px;
padding-left: 43px; padding-left: 43px;
font-size: 1.2em; font-size: 1.2em;
padding-top: 14px; padding-top: 14px;
} }
.btnsalix{ .btnsalix{
margin-bottom: 10px; margin-bottom: 10px;
background-color: rgba(0,0,0,.150); background-color: #8DD202;
background-image: url(../img/salix.png); background-image: url(../img/salix.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 25px; background-size: 25px;
@ -184,7 +184,7 @@ spam{
background-position-x: 10px; background-position-x: 10px;
width: 100%; width: 100%;
height: 50px; height: 50px;
border-radius: 15px; border-radius: 26px;
padding-left: 43px; padding-left: 43px;
font-size: 1.2em; font-size: 1.2em;
padding-top: 14px; padding-top: 14px;
@ -207,11 +207,11 @@ label{
background-position: center; background-position: center;
} }
.input{ .input{
background: rgba(0,0,0,.150); background: #D4D2D4;
padding: 10px; padding: 14px;
overflow: hidden; overflow: hidden;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 15px; border-radius: 26px;
} }
.input img{ .input img{
width: 25px; width: 25px;
@ -254,16 +254,21 @@ input.middle:focus {
.btn{ .btn{
width: 100%; width: 100%;
text-align: center; text-align: center;
background: #F1D05E; background: #8DD202;
color: #fff; color: #fff;
font-size: 1.2em; font-size: 1.2em;
padding: 10px; padding: 10px;
} }
.loginbtn{ .loginbtn{
border-radius: 31px;
position: fixed; position: fixed;
bottom: 15px; bottom: 15px;
left: 0; left: 0;
width: 200px;
margin: auto;
right: 0;
padding: 18px;
} }
.mainheader{ .mainheader{
width: 100%; width: 100%;
@ -328,6 +333,11 @@ input.middle:focus {
header{ header{
background: #000; background: #000;
overflow: hidden; overflow: hidden;
position: fixed;
top: 0;
width: 100%;
left: 0;
}
} }
header h1{ header h1{
float: left; float: left;

BIN
platforms/android/app/src/main/assets/www/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
platforms/android/app/src/main/assets/www/img/password.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

6
platforms/android/app/src/main/assets/www/index.html
View File

@ -9,15 +9,15 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width"> <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
<link rel="stylesheet" type="text/css" href="css/index.css"> <link rel="stylesheet" type="text/css" href="css/index.css">
<title>Verdnatura Laboral</title> <title>Verdnatura Photo</title>
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script> <script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="js/fastclick.js" type="application/javascript"></script> <script src="js/fastclick.js" type="application/javascript"></script>
</head> </head>
<body class="greenBackground"> <body>
<img id="logo" src="img/logo.png" alt="verdnatura"/> <img id="logo" src="img/logo.png" alt="verdnatura"/>
<h1>Verdnatura</h1>
<div class="input"> <div class="input">
<img src="img/user.png" alt="verdnatura" /> <img src="img/user.png" alt="verdnatura" />
<input type="text" id="txtuser" placeholder="usuario" value=""/> <input type="text" id="txtuser" placeholder="usuario" value=""/>

4
platforms/android/app/src/main/assets/www/js/index.js
View File

@ -122,11 +122,11 @@ function confirmSave(buttonIndex) {
data.append("token", localStorage.getItem("token")); data.append("token", localStorage.getItem("token"));
data.append("user", localStorage.getItem("user")); /*data.append("user", localStorage.getItem("user"));
data.append("password", localStorage.getItem("password")); data.append("password", localStorage.getItem("password"));
data.append("updateMatching", 1); data.append("updateMatching", 1);*/
data.append("image", img); data.append("image", img);

6
platforms/android/app/src/main/assets/www/main.html
View File

@ -8,11 +8,11 @@
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width"> <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
<link rel="stylesheet" type="text/css" href="css/index.css"> <link rel="stylesheet" type="text/css" href="css/index.css">
<link href="css/cropper.css" rel="stylesheet" type="text/css"/> <link href="css/cropper.css" rel="stylesheet" type="text/css"/>
<title>Verdnatura Laboral</title> <title>Verdnatura Photo</title>
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script> <script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="js/fastclick.js" type="application/javascript"></script> <script src="js/fastclick.js" type="application/javascript"></script>
</head> </head>
<body class="blueBackground"> <body class="blackground">
<header> <header>
<div class="btnback"></div> <div class="btnback"></div>
<div class="btnsave"></div> <div class="btnsave"></div>
@ -41,7 +41,7 @@
</div> </div>
<div class="btnbarcode">Scan</div> <div class="btnbarcode">Scan</div>
<div class="btnsalix">Salix</div>
<div class="btn loginbtn" id="btntakepicture"> <div class="btn loginbtn" id="btntakepicture">
¡Go! ¡Go!

46
platforms/ios/www/css/index.css
View File

@ -32,6 +32,8 @@ html{
} }
body { body {
background: #fff;
padding: 20px;
-webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */ -webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */
-webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */ -webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */
-webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */ -webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */
@ -41,7 +43,7 @@ body {
font-size:12px; font-size:12px;
margin:0px; margin:0px;
padding:0px;
color: #fff; color: #fff;
@ -56,6 +58,10 @@ p{
.contentPhoto{ .contentPhoto{
width: 100%; width: 100%;
padding: 25px 0px; padding: 25px 0px;
margin-top: 24px;
}
.blackground{
background: #242424;
} }
#photo{ #photo{
max-width: 100%; max-width: 100%;
@ -84,7 +90,7 @@ p{
background: #000; background: #000;
height: 50px; height: 50px;
padding: 5px 0; padding: 5px 0;
left: 0;
} }
.btnmin{ .btnmin{
float: left; float: left;
@ -113,6 +119,7 @@ p{
display: block; display: block;
width: 80px; width: 80px;
margin-top: 50px; margin-top: 50px;
margin-bottom: 50px;
} }
h1{ h1{
color: #fff; color: #fff;
@ -150,18 +157,11 @@ spam{
z-index: 999; z-index: 999;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(247,120,36,1); background: #fff;
background: -moz-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: -webkit-gradient(left bottom, right top, color-stop(0%, rgba(247,120,36,1)), color-stop(23%, rgba(247,120,36,1)), color-stop(100%, rgba(250,217,97,1)));
background: -webkit-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: -o-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: -ms-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
background: linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f77824', endColorstr='#fad961', GradientType=1 );
} }
.btnbarcode{ .btnbarcode{
margin-bottom: 10px; margin-bottom: 10px;
background-color: rgba(0,0,0,.150); background-color: #D4D2D4;
background-image: url(../img/barcode.png); background-image: url(../img/barcode.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 25px; background-size: 25px;
@ -169,14 +169,14 @@ spam{
background-position-x: 10px; background-position-x: 10px;
width: 100%; width: 100%;
height: 50px; height: 50px;
border-radius: 15px; border-radius: 26px;
padding-left: 43px; padding-left: 43px;
font-size: 1.2em; font-size: 1.2em;
padding-top: 14px; padding-top: 14px;
} }
.btnsalix{ .btnsalix{
margin-bottom: 10px; margin-bottom: 10px;
background-color: rgba(0,0,0,.150); background-color: #8DD202;
background-image: url(../img/salix.png); background-image: url(../img/salix.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 25px; background-size: 25px;
@ -184,7 +184,7 @@ spam{
background-position-x: 10px; background-position-x: 10px;
width: 100%; width: 100%;
height: 50px; height: 50px;
border-radius: 15px; border-radius: 26px;
padding-left: 43px; padding-left: 43px;
font-size: 1.2em; font-size: 1.2em;
padding-top: 14px; padding-top: 14px;
@ -207,11 +207,11 @@ label{
background-position: center; background-position: center;
} }
.input{ .input{
background: rgba(0,0,0,.150); background: #D4D2D4;
padding: 10px; padding: 14px;
overflow: hidden; overflow: hidden;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 15px; border-radius: 26px;
} }
.input img{ .input img{
width: 25px; width: 25px;
@ -254,16 +254,21 @@ input.middle:focus {
.btn{ .btn{
width: 100%; width: 100%;
text-align: center; text-align: center;
background: #F1D05E; background: #8DD202;
color: #fff; color: #fff;
font-size: 1.2em; font-size: 1.2em;
padding: 10px; padding: 10px;
} }
.loginbtn{ .loginbtn{
border-radius: 31px;
position: fixed; position: fixed;
bottom: 15px; bottom: 15px;
left: 0; left: 0;
width: 200px;
margin: auto;
right: 0;
padding: 18px;
} }
.mainheader{ .mainheader{
width: 100%; width: 100%;
@ -328,6 +333,11 @@ input.middle:focus {
header{ header{
background: #000; background: #000;
overflow: hidden; overflow: hidden;
position: fixed;
top: 0;
width: 100%;
left: 0;
}
} }
header h1{ header h1{
float: left; float: left;

BIN
platforms/ios/www/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
platforms/ios/www/img/password.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

6
platforms/ios/www/index.html
View File

@ -9,15 +9,15 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width"> <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
<link rel="stylesheet" type="text/css" href="css/index.css"> <link rel="stylesheet" type="text/css" href="css/index.css">
<title>Verdnatura Laboral</title> <title>Verdnatura Photo</title>
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script> <script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="js/fastclick.js" type="application/javascript"></script> <script src="js/fastclick.js" type="application/javascript"></script>
</head> </head>
<body class="greenBackground"> <body>
<img id="logo" src="img/logo.png" alt="verdnatura"/> <img id="logo" src="img/logo.png" alt="verdnatura"/>
<h1>Verdnatura</h1>
<div class="input"> <div class="input">
<img src="img/user.png" alt="verdnatura" /> <img src="img/user.png" alt="verdnatura" />
<input type="text" id="txtuser" placeholder="usuario" value=""/> <input type="text" id="txtuser" placeholder="usuario" value=""/>

4
platforms/ios/www/js/index.js
View File

@ -122,11 +122,11 @@ function confirmSave(buttonIndex) {
data.append("token", localStorage.getItem("token")); data.append("token", localStorage.getItem("token"));
data.append("user", localStorage.getItem("user")); /*data.append("user", localStorage.getItem("user"));
data.append("password", localStorage.getItem("password")); data.append("password", localStorage.getItem("password"));
data.append("updateMatching", 1); data.append("updateMatching", 1);*/
data.append("image", img); data.append("image", img);

4
platforms/ios/www/main.html
View File

@ -8,11 +8,11 @@
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width"> <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
<link rel="stylesheet" type="text/css" href="css/index.css"> <link rel="stylesheet" type="text/css" href="css/index.css">
<link href="css/cropper.css" rel="stylesheet" type="text/css"/> <link href="css/cropper.css" rel="stylesheet" type="text/css"/>
<title>Verdnatura Laboral</title> <title>Verdnatura Photo</title>
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script> <script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
<script src="js/fastclick.js" type="application/javascript"></script> <script src="js/fastclick.js" type="application/javascript"></script>
</head> </head>
<body class="blueBackground"> <body class="blackground">
<header> <header>
<div class="btnback"></div> <div class="btnback"></div>
<div class="btnsave"></div> <div class="btnsave"></div>