mirror of
https://github.com/KeymonSoft/Mariana_Censos.git
synced 2026-04-21 14:49:18 +00:00
Cambio en Cuestionario, para que el panel no quede atras de botones
This commit is contained in:
@@ -104,7 +104,7 @@ Sub agregaPregunta(id As String, pregunta As String, respuestas As List)
|
|||||||
panelSombra.Width = Root2.Width
|
panelSombra.Width = Root2.Width
|
||||||
panelSombra.Height = Root2.Height
|
panelSombra.Height = Root2.Height
|
||||||
panelSombra.BringToFront
|
panelSombra.BringToFront
|
||||||
' panelSombra.Elevation = 0
|
panelSombra.Elevation = 100
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
private Sub preguntaContestada(Success As Map) 'ignore
|
private Sub preguntaContestada(Success As Map) 'ignore
|
||||||
|
|||||||
@@ -172,6 +172,8 @@ Sub B4XPage_Appear
|
|||||||
' Log($"${B4XPages.MainPage.principal.l_dia.text}, ${Starter.dia_semana}"$)
|
' Log($"${B4XPages.MainPage.principal.l_dia.text}, ${Starter.dia_semana}"$)
|
||||||
'Revisamos si el cliente actual es diferente del anterior y si es diferente ponemos encuestaIniciada en VERDADERO.
|
'Revisamos si el cliente actual es diferente del anterior y si es diferente ponemos encuestaIniciada en VERDADERO.
|
||||||
If clienteAnt <> no_cliente Then q.encuestaIniciada = False
|
If clienteAnt <> no_cliente Then q.encuestaIniciada = False
|
||||||
|
q.encuestaIniciada = False
|
||||||
|
q.ocultPanelPregunta
|
||||||
clienteAnt = no_cliente
|
clienteAnt = no_cliente
|
||||||
' Log("CON ENCUESTA: " & q.clienteConCuestionario(Subs.traeCliente))
|
' Log("CON ENCUESTA: " & q.clienteConCuestionario(Subs.traeCliente))
|
||||||
' Log("INICIADA: " & q.encuestaIniciada)
|
' Log("INICIADA: " & q.encuestaIniciada)
|
||||||
@@ -182,9 +184,11 @@ Sub B4XPage_Appear
|
|||||||
Else
|
Else
|
||||||
p_botones.Top = l_tituloCuestionaro.Top + 20dip
|
p_botones.Top = l_tituloCuestionaro.Top + 20dip
|
||||||
End If
|
End If
|
||||||
|
Private hayCuestionario As Boolean = False
|
||||||
Private cuest As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select * from cuestionario where Q_IDCLIENTE = '${Subs.traeCliente}'"$)
|
Private cuest As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select * from cuestionario where Q_IDCLIENTE = '${Subs.traeCliente}'"$)
|
||||||
If cuest.RowCount > 0 Then
|
If cuest.RowCount > 0 Then
|
||||||
Log("HAY CUESTIONARIO")
|
Log("HAY CUESTIONARIO")
|
||||||
|
hayCuestionario = True
|
||||||
Private cs As CSBuilder
|
Private cs As CSBuilder
|
||||||
cs.Initialize
|
cs.Initialize
|
||||||
For i = 0 To cuest.RowCount - 1
|
For i = 0 To cuest.RowCount - 1
|
||||||
@@ -197,8 +201,11 @@ Sub B4XPage_Appear
|
|||||||
l_cuestionario.Height = su.MeasureMultilineTextHeight(l_cuestionario, l_cuestionario.Text)
|
l_cuestionario.Height = su.MeasureMultilineTextHeight(l_cuestionario, l_cuestionario.Text)
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Log($"${q.encuestaIniciada} | ${cargarCliente}"$)
|
Log($"${(Not(q.encuestaIniciada) And Not(cargarCliente))} | ${Not(hayCuestionario)}"$)
|
||||||
If Not(q.encuestaIniciada) And Not(cargarCliente) Then q.agregaPregunta("1", "¿Se puede acceder al negocio o está enrejado?", Array As String("No, está enrejado o no se tiene acceso", "Si se pude acceder"))
|
If (Not(q.encuestaIniciada) And Not(cargarCliente)) Or (Not(hayCuestionario)) Then
|
||||||
|
Log("Mostramos encuesta")
|
||||||
|
q.agregaPregunta("1", "¿Se puede acceder al negocio o está enrejado?", Array As String("No, está enrejado o no se tiene acceso", "Si se pude acceder"))
|
||||||
|
End If
|
||||||
ajustaTamano
|
ajustaTamano
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -395,6 +402,8 @@ End Sub
|
|||||||
Sub B4XPage_CloseRequest As ResumableSub
|
Sub B4XPage_CloseRequest As ResumableSub
|
||||||
Log("CloseRequest NC")
|
Log("CloseRequest NC")
|
||||||
StopCamera2
|
StopCamera2
|
||||||
|
q.ocultPanelPregunta
|
||||||
|
q.panelSombra.Visible = False
|
||||||
CallSubDelayed(Tracker, "StartFLP")
|
CallSubDelayed(Tracker, "StartFLP")
|
||||||
If p_camara.Visible Then
|
If p_camara.Visible Then
|
||||||
p_camara.Visible = False
|
p_camara.Visible = False
|
||||||
|
|||||||
@@ -753,7 +753,7 @@ Version=12.5
|
|||||||
#Region Project Attributes
|
#Region Project Attributes
|
||||||
#ApplicationLabel: Mariana Censos
|
#ApplicationLabel: Mariana Censos
|
||||||
#VersionCode: 1
|
#VersionCode: 1
|
||||||
#VersionName: 4.01.31
|
#VersionName: 4.02.01
|
||||||
'SupportedOrientations possible values: unspecified, landscape or portrait.
|
'SupportedOrientations possible values: unspecified, landscape or portrait.
|
||||||
#SupportedOrientations: portrait
|
#SupportedOrientations: portrait
|
||||||
#CanInstallToExternalStorage: False
|
#CanInstallToExternalStorage: False
|
||||||
|
|||||||
@@ -43,12 +43,12 @@ ModuleClosedNodes15=
|
|||||||
ModuleClosedNodes16=4,5,6,10,13,17,18,19
|
ModuleClosedNodes16=4,5,6,10,13,17,18,19
|
||||||
ModuleClosedNodes2=
|
ModuleClosedNodes2=
|
||||||
ModuleClosedNodes3=
|
ModuleClosedNodes3=
|
||||||
ModuleClosedNodes4=6,7,10,11,14,15,16,17,18,20,21,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44
|
ModuleClosedNodes4=7,10,11,14,15,16,17,18,20,21,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44
|
||||||
ModuleClosedNodes5=
|
ModuleClosedNodes5=
|
||||||
ModuleClosedNodes6=
|
ModuleClosedNodes6=
|
||||||
ModuleClosedNodes7=
|
ModuleClosedNodes7=
|
||||||
ModuleClosedNodes8=9,13,14,16,17
|
ModuleClosedNodes8=9,13,14,17
|
||||||
ModuleClosedNodes9=1,5
|
ModuleClosedNodes9=1
|
||||||
NavigationStack=C_NuevoCliente,mandaPendientesNuevosClientes,464,3,Starter,Service_Create,34,0,Starter,Process_Globals,15,3,C_Clientes,clv_clientes_ItemClick,175,0,MAPA_RUTAS,OnInfoWindowClickListener1_click,259,0,C_NuevoCliente,Class_Globals,42,0,C_NuevoCliente,InitializeCamera2,281,0,C_Principal,nvo_cliente_Click,1077,0,B4XMainPage,B4XPage_Appear,226,2,C_NuevoCliente,B4XPage_Appear,91,0
|
NavigationStack=C_Cliente,cb_diaSemana_SelectedIndexChanged,706,0,C_Cliente,q_preguntaContestada,765,0,C_Cliente,Class_Globals,141,0,C_NuevoCliente,Class_Globals,5,0,C_NuevoCliente,B4XPage_CloseRequest,399,0,C_Cliente,B4XPage_Appear,202,0,C_Cuestionario,Class_Globals,0,0,C_Cuestionario,pSombra_Click,109,0,C_Cuestionario,preguntaContestada,108,0,C_Cuestionario,agregaPregunta,100,1
|
||||||
SelectedBuild=0
|
SelectedBuild=0
|
||||||
VisibleModules=2,14,6,9,4,8,5,15,7,16,13
|
VisibleModules=2,14,6,9,4,8,5,15,7,16
|
||||||
|
|||||||
Reference in New Issue
Block a user