mirror of
https://github.com/KeymonSoft/ADM.git
synced 2026-04-20 04:39:15 +00:00
- VERSION 5.08.26
- [x] Cambiar el texto de la No Venta a : "Causas de no venta" - [x] En lugar de "peso", poner "kilos". - [x] Si la tienda está cerrada, solicitar foto de la tienda. - [x] Hay que pedir foto al iniciar el día. - [x] Cuando se carga día, mandar en la bitácora la ruta. - [x] Quitar botón de clientes nuevos. - [x] Cuando ya guardamos una foto de tienda cerrada, no pedía la foto en los demás clientes de tienda cerrada. - [x] El botón del mapa en principal, al principio se veia bien, y luego se movia a la izquierda
This commit is contained in:
@@ -19,6 +19,7 @@ Sub Process_Globals
|
||||
Dim c2 As Cursor
|
||||
Dim c22 As Cursor
|
||||
Dim c3 As Cursor
|
||||
Private xui As XUI 'ignore
|
||||
End Sub
|
||||
|
||||
Sub Globals
|
||||
@@ -72,6 +73,7 @@ Sub Globals
|
||||
Private p_botonesNoVenta As Panel
|
||||
Private Panel5 As Panel
|
||||
Private et_comentarioNoVenta As EditText
|
||||
Private r_opcion5 As RadioButton
|
||||
Private r_opcion4 As RadioButton
|
||||
Private r_opcion3 As RadioButton
|
||||
Private r_opcion2 As RadioButton
|
||||
@@ -79,6 +81,18 @@ Sub Globals
|
||||
Private l_NoVenta As Label
|
||||
Dim motivo As String
|
||||
Private l_venta As Label
|
||||
Private camEx As CameraExClass
|
||||
Dim fototomada As String = "0"
|
||||
Private frontCamera As Boolean = False
|
||||
Private p_camara As Panel
|
||||
Private b_cam As Button
|
||||
Private b_foto_inci As Button
|
||||
Private p_cam As Panel
|
||||
Dim sDate As String
|
||||
Dim sTime As String
|
||||
Private p_camara2 As Panel
|
||||
Private nombreFoto As String
|
||||
Dim fotoCerrado As String = ""
|
||||
End Sub
|
||||
|
||||
Sub Activity_Create(FirstTime As Boolean)
|
||||
@@ -138,7 +152,6 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
c.Position =0
|
||||
SEMANA = c.GetString("CUANTOS")
|
||||
c.Close
|
||||
|
||||
If SEMANA > 0 Then
|
||||
c=skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SEMANA"))
|
||||
c.Position =0
|
||||
@@ -149,6 +162,8 @@ End Sub
|
||||
|
||||
Sub Activity_Resume
|
||||
Log("MAPA_RUTAS RESUME")
|
||||
InitializeCamera
|
||||
fotoCerrado = ""
|
||||
Starter.rp.Check(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION)
|
||||
Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
|
||||
If Result Then
|
||||
@@ -182,6 +197,9 @@ Sub Activity_Resume
|
||||
ventaIniciada
|
||||
End If
|
||||
End If
|
||||
p_camara.Top = 0 : p_camara.Left = 0
|
||||
p_camara.Width = Activity.Width : p_camara.Height = Activity.Height
|
||||
Subs.centraPanel(p_camara2, Activity.Width)
|
||||
End Sub
|
||||
|
||||
Sub MapFragment1_Ready
|
||||
@@ -320,12 +338,22 @@ Sub OnInfoWindowClickListener1_click(Marker1 As Marker)
|
||||
Log("Tooltip clicked")
|
||||
skmt.ExecNonQuery("delete from CUENTAA")
|
||||
skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?) ", Array As Object(Marker1.Title))
|
||||
' Activity.Finish
|
||||
Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito
|
||||
l_venta.Text = "Presiona el boton de ""Iniciar"" para inicar la venta"
|
||||
b_inicioVenta.Enabled = True
|
||||
b_finVenta.Enabled = False
|
||||
p_transparenciaIniciaInicioFinVenta.Visible = True
|
||||
c = Starter.skmt.ExecQuery("SELECT * FROM FOTOINICIAL")
|
||||
If c.RowCount = 0 Then
|
||||
p_camara.Visible = True
|
||||
InitializeCamera
|
||||
p_camara.Left = 0
|
||||
p_camara.Visible = True
|
||||
nombreFoto = "inicio"
|
||||
b_foto_inci.Text = "Foto tienda"
|
||||
Else
|
||||
' Activity.Finish
|
||||
Starter.pre_viejo = Subs.traeTotalClientepreventaparacredito
|
||||
l_venta.Text = "Presiona el boton de ""Iniciar"" para inicar la venta"
|
||||
b_inicioVenta.Enabled = True
|
||||
b_finVenta.Enabled = False
|
||||
p_transparenciaIniciaInicioFinVenta.Visible = True
|
||||
End If
|
||||
' B4XPages.ShowPage("Cliente")
|
||||
End Sub
|
||||
|
||||
@@ -456,7 +484,7 @@ Private Sub b_guardarPeso_Click
|
||||
Private peso As Double = et_guardarPeso.Text
|
||||
et_guardarPeso.Text = peso
|
||||
|
||||
Subs.guardaPeso("VENTA", Subs.traeAlmacen, Subs.traeRuta2(Subs.traeCliente), Subs.traeUsuarioDeBD, Subs.traeCliente, peso, "", "")
|
||||
Subs.guardaPeso("VENTA", Subs.traeAlmacen, Subs.traeRuta2(Subs.traeCliente), Subs.traeUsuarioDeBD, Subs.traeCliente, peso, "", "", "")
|
||||
Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRuta, "Termina Venta", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, 2, "", "", $"Venta:${et_guardarPeso.text}"$)
|
||||
Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
|
||||
Starter.enVenta = False
|
||||
@@ -495,24 +523,34 @@ Private Sub b_guardaNoVenta_Click
|
||||
motivo = "NO COMPRA"
|
||||
Else If r_opcion3.Checked Then
|
||||
motivo = "CON PRODUCTO"
|
||||
Else
|
||||
Else If r_opcion4.Checked Then
|
||||
motivo = "NO ESTA EL ENCARGADO"
|
||||
Else
|
||||
motivo = "CANCELACION"
|
||||
End If
|
||||
If motivo = "CERRADO" And fotoCerrado = "" Then
|
||||
nombreFoto = Subs.traeCliente & "_cerrado"
|
||||
p_camara.Visible = True
|
||||
InitializeCamera
|
||||
p_camara.Left = 0
|
||||
p_camara.Visible = True
|
||||
p_camara.BringToFront
|
||||
b_foto_inci.Text = "Foto tienda"
|
||||
Else
|
||||
DateTime.DateFormat="yy-MM-dd HH:mm:ss"
|
||||
Dim fecha As String=DateTime.Date(DateTime.Now)
|
||||
Subs.guardaPeso("NO VENTA", Subs.traeAlmacen, Subs.traeRuta2(Subs.traeCliente), Subs.traeUsuarioDeBD, Subs.traeCliente, "0", motivo, et_comentarioNoVenta.text, fotoCerrado)
|
||||
Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRuta, "No Venta", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, 2, motivo, et_comentarioNoVenta.text, $"Venta:${et_guardarPeso.text}"$)
|
||||
Starter.enVenta = False
|
||||
Subs.enVenta(0, "")
|
||||
Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
|
||||
p_noVenta.Visible = False
|
||||
p_guardarPeso.Visible = False
|
||||
p_transparenciaIniciaInicioFinVenta.Visible = False
|
||||
gmap.Clear
|
||||
todos = 1
|
||||
MapFragment1_Ready
|
||||
End If
|
||||
DateTime.DateFormat="yy-MM-dd HH:mm:ss"
|
||||
Dim fecha As String=DateTime.Date(DateTime.Now)
|
||||
|
||||
Subs.guardaPeso("NO VENTA", Subs.traeAlmacen, Subs.traeRuta2(Subs.traeCliente), Subs.traeUsuarioDeBD, Subs.traeCliente, "0", motivo, et_comentarioNoVenta.text)
|
||||
Subs.bitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRuta, "No Venta", Subs.traeCliente, "", Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, 2, motivo, et_comentarioNoVenta.text, $"Venta:${et_guardarPeso.text}"$)
|
||||
Starter.enVenta = False
|
||||
Subs.enVenta(0, "")
|
||||
|
||||
Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
|
||||
p_noVenta.Visible = False
|
||||
p_guardarPeso.Visible = False
|
||||
p_transparenciaIniciaInicioFinVenta.Visible = False
|
||||
gmap.Clear
|
||||
todos = 1
|
||||
MapFragment1_Ready
|
||||
End Sub
|
||||
|
||||
Private Sub b_cancelaNoVenta_Click
|
||||
@@ -521,4 +559,154 @@ End Sub
|
||||
|
||||
Private Sub p_inicioFinVenta_Click
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub b_foto_inci_Click
|
||||
camEx.TakePicture
|
||||
End Sub
|
||||
|
||||
Private Sub InitializeCamera
|
||||
' Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_CAMERA)
|
||||
' Wait For B4XPage_PermissionResult (Permission As String, resulta As Boolean)
|
||||
' If resulta Then
|
||||
camEx.Initialize(p_cam, frontCamera, Me, "Camera1")
|
||||
frontCamera = camEx.Front
|
||||
' Else
|
||||
' ToastMessageShow("Sin permisos de camara!!!", True)
|
||||
' End If
|
||||
End Sub
|
||||
|
||||
Sub Camera1_Ready (Success As Boolean)
|
||||
If Success Then
|
||||
camEx.SetJpegQuality(90)
|
||||
camEx.SetContinuousAutoFocus
|
||||
camEx.CommitParameters
|
||||
camEx.StartPreview
|
||||
Log(camEx.GetPreviewSize)
|
||||
Else
|
||||
ToastMessageShow("Cannot open camera.", True)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub Camera1_PictureTaken (Data() As Byte)
|
||||
If b_foto_inci.Text = "Foto tienda" Then
|
||||
DateTime.DateFormat="ddMMyyyyHHmmss"
|
||||
fototomada = DateTime.Now & $"_${nombreFoto}.jpg"$
|
||||
Dim filename As String = fototomada
|
||||
Dim dir As String = File.DirInternal
|
||||
camEx.SavePictureToFile(Data, dir, filename)
|
||||
camEx.StartPreview 'restart preview
|
||||
ToastMessageShow("Picture saved." & CRLF & "File size: " & File.Size(dir, filename), True)
|
||||
Dim Dirp As String = File.DirInternal
|
||||
Dim dir As String
|
||||
Dim Dir2 As String
|
||||
Try
|
||||
File.MakeDir(Dirp,"/adm")
|
||||
dir = "/adm"
|
||||
Log("creado en promotoria " & Dirp & dir)
|
||||
Catch
|
||||
dir = ""
|
||||
Log("creado en raiz")
|
||||
End Try
|
||||
Try
|
||||
File.MakeDir(Dirp & dir,"/reduccion")
|
||||
Dir2 = "/reduccion"
|
||||
Log("creado en promotoria " & Dirp & dir & Dir2)
|
||||
Catch
|
||||
Dir2 = ""
|
||||
Log("creado en raiz")
|
||||
End Try
|
||||
DateTime.DateFormat = "MM/dd/yyyy"
|
||||
DateTime.TimeFormat = "HH:mm:ss"
|
||||
sDate = DateTime.Date(DateTime.Now)
|
||||
sTime = DateTime.Time(DateTime.Now)
|
||||
camEx.SavePictureToFile(Data, Dirp&dir, filename)
|
||||
camEx.StartPreview 'restart preview
|
||||
ToastMessageShow("Picture saved." & CRLF & "File size: " & File.Size(dir, filename) & dir &"," & filename, True)
|
||||
Log("Picture saved." & CRLF & "File size: " & File.Size(dir, filename) & dir &"," & filename)
|
||||
|
||||
Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirInternal & dir, filename, 450, 600, True)
|
||||
Dim out As OutputStream = File.OpenOutput(File.DirInternal & dir & Dir2, filename, False)
|
||||
img.WriteToStream(out, 100, "PNG")
|
||||
out.Close
|
||||
If nombreFoto = "inicio" Then
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO FOTOINICIAL (RUTAA, ALMACEN, LATITUD, LONGITUD, FECHAHORA, FOTO, USUARIO) VALUES (?,?,?,?,?,?,?)",Array As Object(Subs.traeRuta, Subs.traeAlmacen, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, sDate & " " & sTime, File.ReadBytes(File.DirInternal & dir & Dir2, fototomada), Subs.traeUsuarioDeBD))
|
||||
b_foto_inci.Text = "Foto usuario"
|
||||
ChangeCamera_Click
|
||||
Else
|
||||
fotoCerrado = fototomada
|
||||
p_camara.Visible = False
|
||||
StopCamera
|
||||
End If
|
||||
Else If b_foto_inci.Text = "Foto usuario" Then
|
||||
DateTime.DateFormat="ddMMyyyyHHmmss"
|
||||
fototomada = fototomada = DateTime.Now & $"_${nombreFoto}.jpg"$
|
||||
Dim filename As String = fototomada
|
||||
Dim dir As String = File.DirInternal
|
||||
camEx.SavePictureToFile(Data, dir, filename)
|
||||
camEx.StartPreview 'restart preview
|
||||
ToastMessageShow("Picture saved." & CRLF & "File size: " & File.Size(dir, filename), True)
|
||||
Dim Dirp As String = File.DirInternal
|
||||
Dim dir As String
|
||||
Dim Dir2 As String
|
||||
Try
|
||||
File.MakeDir(Dirp,"/adm")
|
||||
dir = "/adm"
|
||||
Log("creado en promotoria " & Dirp & dir)
|
||||
Catch
|
||||
dir = ""
|
||||
Log("creado en raiz")
|
||||
End Try
|
||||
Try
|
||||
File.MakeDir(Dirp & dir,"/reduccion")
|
||||
Dir2 = "/reduccion"
|
||||
Log("creado en promotoria " & Dirp & dir & Dir2)
|
||||
Catch
|
||||
dir = ""
|
||||
Log("creado en raiz")
|
||||
End Try
|
||||
DateTime.DateFormat = "MM/dd/yyyy"
|
||||
DateTime.TimeFormat = "HH:mm:ss"
|
||||
sDate = DateTime.Date(DateTime.Now)
|
||||
sTime = DateTime.Time(DateTime.Now)
|
||||
camEx.SavePictureToFile(Data, Dirp&dir, filename)
|
||||
camEx.StartPreview 'restart preview
|
||||
ToastMessageShow("Picture saved." & CRLF & "File size: " & File.Size(dir, filename) & dir &"," & filename, True)
|
||||
Log("Picture saved." & CRLF & "File size: " & File.Size(dir, filename) & dir &"," & filename)
|
||||
Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirInternal & dir, filename, 450, 600, True)
|
||||
Dim out As OutputStream = File.OpenOutput(File.DirInternal & dir & Dir2, filename, False)
|
||||
img.WriteToStream(out, 100, "PNG")
|
||||
out.Close
|
||||
B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE FOTOINICIAL set FOTO2 = ? where USUARIO = ? and RUTAA = ? and ALMACEN = ? ", Array As Object (File.ReadBytes(File.DirInternal & dir & Dir2, fototomada), Subs.traeUsuarioDeBD,Subs.traeRuta, Subs.traeAlmacen ))
|
||||
b_foto_inci.Text = "Foto tienda"
|
||||
ChangeCamera_Click
|
||||
p_camara.Visible = False
|
||||
StopCamera
|
||||
If Subs.traeCliente = "0" Then
|
||||
B4XPages.MainPage.tipo_venta = "ABORDO"
|
||||
Else If Subs.traeCliente = "1" Then
|
||||
B4XPages.MainPage.tipo_venta = "RECARGA"
|
||||
Else
|
||||
B4XPages.MainPage.tipo_venta = "PREVENTA"
|
||||
End If
|
||||
' B4XPages.ShowPage("productos")
|
||||
' p_transparentePidePeso.Visible = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub ChangeCamera_Click
|
||||
camEx.Release
|
||||
frontCamera = Not(frontCamera)
|
||||
InitializeCamera
|
||||
End Sub
|
||||
|
||||
Private Sub StopCamera
|
||||
' Capturing = False
|
||||
If camEx.IsInitialized Then
|
||||
camEx.Release
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub p_camara_Click
|
||||
|
||||
End Sub
|
||||
Reference in New Issue
Block a user