From 5fd43b48f334ea6100455289a34d355dfbc023fc Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Fri, 8 Nov 2024 14:49:26 -0300 Subject: [PATCH] =?UTF-8?q?hotfix=20considera=C3=A7=C3=B5es=20finais=20do?= =?UTF-8?q?=20pr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../people_on_the_property_page_widget.dart | 25 ++++++++-------- .../vehicles_on_the_property.dart | 29 +++++++++---------- lib/pages/visits_on_the_property/model.dart | 15 ++++++---- .../visits_on_the_property_screen.dart | 29 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart b/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart index 82d70229..96de721d 100644 --- a/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart +++ b/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart @@ -28,15 +28,15 @@ class _PeopleOnThePropertyPageState extends State with late final PeopleOnThePropertyPageModel model; - late Future _petsFuture; - List _petsWrap = []; + late Future _future; + List _wrap = []; @override void initState() { super.initState(); model = createModel(context, () => PeopleOnThePropertyPageModel(onRefresh: () => safeSetState(() {}))); - _petsFuture = _fetchVisits(); + _future = _fetchVisits(); _scrollController = ScrollController() ..addListener(() { @@ -68,7 +68,7 @@ class _PeopleOnThePropertyPageState extends State with children: [ Center( child: Text(FFLocalizations.of(context) - .getVariableText(ptText: "Nenhum veículo encontrado!", enText: "No vehicle found")), + .getVariableText(ptText: "Nenhum morador encontrado!", enText: "No residents found!")), ) ], ), @@ -76,26 +76,25 @@ class _PeopleOnThePropertyPageState extends State with else if (_hasData == true || _pageNumber >= 1) Expanded( child: FutureBuilder( - future: _petsFuture, + future: _future, builder: (context, snapshot) { return ListView.builder( shrinkWrap: true, physics: const BouncingScrollPhysics(), controller: _scrollController, - itemCount: _petsWrap.length + 1, + itemCount: _wrap.length + 1, itemBuilder: (context, index) { if (index == 0) { // Add your item here return Padding( padding: const EdgeInsets.only(right: 30, top: 10), child: Text( - // model.petAmountRegister == '0' ? FFLocalizations.of(context).getVariableText(ptText: "Ilimitado", enText: "Unlimited") : "${FFLocalizations.of(context).getVariableText(ptText: "Quantidade de Pets: ", enText: "Amount of Pets: ")}$count/${model.petAmountRegister}", '', textAlign: TextAlign.right, ), ); } else { - final item = _petsWrap[index - 1]; + final item = _wrap[index - 1]; return _item(context, item); } }); @@ -157,12 +156,12 @@ class _PeopleOnThePropertyPageState extends State with var response = await PhpGroup.getResidentsByProperty.call(_pageNumber.toString()); - final List pets = response.jsonBody['residents'] ?? []; + final List residents = response.jsonBody['residents'] ?? []; safeSetState(() => count = response.jsonBody['total_rows'] ?? 0); - if (pets.isNotEmpty) { + if (residents.isNotEmpty) { setState(() { - _petsWrap.addAll(pets); + _wrap.addAll(residents); _hasData = true; _loading = false; }); @@ -180,7 +179,7 @@ class _PeopleOnThePropertyPageState extends State with return null; } catch (e, s) { DialogUtil.errorDefault(context); - LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Pets", e, s); + LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de moradores", e, s); setState(() { _hasData = false; _loading = false; @@ -193,7 +192,7 @@ class _PeopleOnThePropertyPageState extends State with if (_hasData == true) { _pageNumber++; - _petsFuture = _fetchVisits(); + _future = _fetchVisits(); } } diff --git a/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart b/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart index 186a8fa0..6b4b8afc 100644 --- a/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart +++ b/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart @@ -25,14 +25,14 @@ class _VehicleOnThePropertyState extends State with Ticker int count = 0; late final VehicleModel model; - late Future _petsFuture; - List _petsWrap = []; + late Future _future; + List _wrap = []; @override void initState() { super.initState(); model = createModel(context, () => VehicleModel()); - _petsFuture = _fetchVisits(); + _future = _fetchVisits(); _scrollController = ScrollController() ..addListener(() { @@ -72,26 +72,25 @@ class _VehicleOnThePropertyState extends State with Ticker else if (_hasData == true || _pageNumber >= 1) Expanded( child: FutureBuilder( - future: _petsFuture, + future: _future, builder: (context, snapshot) { return ListView.builder( shrinkWrap: true, physics: const BouncingScrollPhysics(), controller: _scrollController, - itemCount: _petsWrap.length + 1, + itemCount: _wrap.length + 1, itemBuilder: (context, index) { if (index == 0) { // Add your item here return Padding( padding: const EdgeInsets.only(right: 30, top: 10), child: Text( - // model.petAmountRegister == '0' ? FFLocalizations.of(context).getVariableText(ptText: "Ilimitado", enText: "Unlimited") : "${FFLocalizations.of(context).getVariableText(ptText: "Quantidade de Pets: ", enText: "Amount of Pets: ")}$count/${model.petAmountRegister}", '', textAlign: TextAlign.right, ), ); } else { - final item = _petsWrap[index - 1]; + final item = _wrap[index - 1]; return _item(context, item); } }); @@ -153,12 +152,12 @@ class _VehicleOnThePropertyState extends State with Ticker var response = await PhpGroup.getVehiclesByProperty.call(_pageNumber.toString()); - final List pets = response.jsonBody['vehicles'] ?? []; + final List vehicles = response.jsonBody['vehicles'] ?? []; safeSetState(() => count = response.jsonBody['total_rows'] ?? 0); - if (pets.isNotEmpty) { + if (vehicles.isNotEmpty) { setState(() { - _petsWrap.addAll(pets); + _wrap.addAll(vehicles); _hasData = true; _loading = false; }); @@ -176,7 +175,7 @@ class _VehicleOnThePropertyState extends State with Ticker return null; } catch (e, s) { DialogUtil.errorDefault(context); - LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Pets", e, s); + LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Veículo", e, s); setState(() { _hasData = false; _loading = false; @@ -189,7 +188,7 @@ class _VehicleOnThePropertyState extends State with Ticker if (_hasData == true) { _pageNumber++; - _petsFuture = _fetchVisits(); + _future = _fetchVisits(); } } @@ -231,12 +230,12 @@ class _VehicleOnThePropertyState extends State with Ticker ).whenComplete(() { safeSetState(() { _pageNumber = 1; - _petsWrap = []; - _petsFuture = _fetchVisits().then((value) => value!.jsonBody['pets'] ?? []); + _wrap = []; + _future = _fetchVisits().then((value) => value!.jsonBody['vehicles'] ?? []); }); }).catchError((e, s) { DialogUtil.errorDefault(context); - LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Pets", e, s); + LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Veículos", e, s); safeSetState(() { _hasData = false; _loading = false; diff --git a/lib/pages/visits_on_the_property/model.dart b/lib/pages/visits_on_the_property/model.dart index 458af347..455b44cd 100644 --- a/lib/pages/visits_on_the_property/model.dart +++ b/lib/pages/visits_on_the_property/model.dart @@ -78,10 +78,13 @@ class VisitsModel extends FlutterFlowModel { imagePath: 'https://freaccess.com.br/freaccess/getImage.php?devUUID=${devUUID}&cliID=${cliUUID}&atividade=getFoto&Documento=${item['VDO_DOCUMENTO']}&tipo=E', statusHashMap: [ - if (item['VTA_NOME'] != null) - Map.from( - {item['VTA_NOME'].toString().toUpperCase(): FlutterFlowTheme.of(context).warning}), - ], - ); - } + if (item['VTA_FIXA'] != null) + Map.from({ + item['VTA_FIXA'] + ? FFLocalizations.of(context).getVariableText(ptText: "Entrada Única", enText: "Single Entry") + : FFLocalizations.of(context).getVariableText(ptText: "Entrada Recorrente", enText: "Recurrent Entry") + : FlutterFlowTheme.of(context).warning + }), + ]); + } } diff --git a/lib/pages/visits_on_the_property/visits_on_the_property_screen.dart b/lib/pages/visits_on_the_property/visits_on_the_property_screen.dart index 0245f199..477a5958 100644 --- a/lib/pages/visits_on_the_property/visits_on_the_property_screen.dart +++ b/lib/pages/visits_on_the_property/visits_on_the_property_screen.dart @@ -25,14 +25,14 @@ class _VisitsOnThePropertyState extends State with TickerPr int count = 0; late final VisitsModel model; - late Future _visitsFuture; - List _visitsList = []; + late Future _future; + List _list = []; @override void initState() { super.initState(); model = createModel(context, () => VisitsModel(onRefresh: () => safeSetState((){}))); - _visitsFuture = _fetchVisits(); + _future = _fetchVisits(); _scrollController = ScrollController() ..addListener(() { @@ -72,26 +72,25 @@ class _VisitsOnThePropertyState extends State with TickerPr else if (_hasData == true || _pageNumber >= 1) Expanded( child: FutureBuilder( - future: _visitsFuture, + future: _future, builder: (context, snapshot) { return ListView.builder( shrinkWrap: true, physics: const BouncingScrollPhysics(), controller: _scrollController, - itemCount: _visitsList.length + 1, + itemCount: _list.length + 1, itemBuilder: (context, index) { if (index == 0) { // Add your item here return Padding( padding: const EdgeInsets.only(right: 30, top: 10), child: Text( - // model.petAmountRegister == '0' ? FFLocalizations.of(context).getVariableText(ptText: "Ilimitado", enText: "Unlimited") : "${FFLocalizations.of(context).getVariableText(ptText: "Quantidade de Pets: ", enText: "Amount of Pets: ")}$count/${model.petAmountRegister}", '', textAlign: TextAlign.right, ), ); } else { - final item = _visitsList[index - 1]; + final item = _list[index - 1]; return _item(context, item); } }); @@ -153,12 +152,12 @@ class _VisitsOnThePropertyState extends State with TickerPr var response = await PhpGroup.getOpenedVisits.call(_pageNumber.toString()); - final List pets = response.jsonBody['visitas'] ?? []; + final List visits = response.jsonBody['visitas'] ?? []; safeSetState(() => count = response.jsonBody['total_rows'] ?? 0); - if (pets.isNotEmpty) { + if (visits.isNotEmpty) { setState(() { - _visitsList.addAll(pets); + _list.addAll(visits); _hasData = true; _loading = false; }); @@ -176,7 +175,7 @@ class _VisitsOnThePropertyState extends State with TickerPr return null; } catch (e, s) { DialogUtil.errorDefault(context); - LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Pets", e, s); + LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Visitas", e, s); setState(() { _hasData = false; _loading = false; @@ -189,7 +188,7 @@ class _VisitsOnThePropertyState extends State with TickerPr if (_hasData == true) { _pageNumber++; - _visitsFuture = _fetchVisits(); + _future = _fetchVisits(); } } @@ -248,12 +247,12 @@ class _VisitsOnThePropertyState extends State with TickerPr ).whenComplete(() { safeSetState(() { _pageNumber = 1; - _visitsList = []; - _visitsFuture = _fetchVisits().then((value) => value!.jsonBody['pets'] ?? []); + _list = []; + _future = _fetchVisits().then((value) => value!.jsonBody['visitas'] ?? []); }); }).catchError((e, s) { DialogUtil.errorDefault(context); - LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Pets", e, s); + LogUtil.requestAPIFailed("proccessRequest.php", "", "Consulta de Visitas", e, s); safeSetState(() { _hasData = false; _loading = false;