mirror of
https://gitlab.com/fabinfra/fabaccess/borepin.git
synced 2025-03-12 14:51:44 +01:00
Merge branch 'fix/qrcodes' into 'main'
Added: QR-Code Changes See merge request fabinfra/fabaccess/borepin!77
This commit is contained in:
commit
e9b2679418
@ -11,10 +11,9 @@
|
|||||||
ScanResultCommand="{Binding ScannedCommand}"
|
ScanResultCommand="{Binding ScannedCommand}"
|
||||||
IsScanning="{Binding IsScanning}"
|
IsScanning="{Binding IsScanning}"
|
||||||
Options="{Binding ScanOptions}"
|
Options="{Binding ScanOptions}"
|
||||||
WidthRequest="300"
|
VerticalOptions="FillAndExpand"
|
||||||
HeightRequest="500"
|
HorizontalOptions="FillAndExpand"
|
||||||
VerticalOptions="CenterAndExpand"
|
Margin="10"/>
|
||||||
HorizontalOptions="CenterAndExpand"/>
|
|
||||||
<Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
|
<Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
|
||||||
</StackLayout>
|
</StackLayout>
|
||||||
</ContentPage.Content>
|
</ContentPage.Content>
|
||||||
|
@ -11,10 +11,9 @@
|
|||||||
ScanResultCommand="{Binding ScannedCommand}"
|
ScanResultCommand="{Binding ScannedCommand}"
|
||||||
IsScanning="{Binding IsScanning}"
|
IsScanning="{Binding IsScanning}"
|
||||||
Options="{Binding ScanOptions}"
|
Options="{Binding ScanOptions}"
|
||||||
WidthRequest="300"
|
VerticalOptions="FillAndExpand"
|
||||||
HeightRequest="500"
|
HorizontalOptions="FillAndExpand"
|
||||||
VerticalOptions="CenterAndExpand"
|
Margin="10"/>
|
||||||
HorizontalOptions="CenterAndExpand"/>
|
|
||||||
<Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
|
<Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
|
||||||
</StackLayout>
|
</StackLayout>
|
||||||
</ContentPage.Content>
|
</ContentPage.Content>
|
||||||
|
@ -125,13 +125,6 @@ namespace Borepin.PageModel
|
|||||||
get => _MachineListItemViewModel_List;
|
get => _MachineListItemViewModel_List;
|
||||||
set => SetProperty(ref _MachineListItemViewModel_List, value);
|
set => SetProperty(ref _MachineListItemViewModel_List, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool _IsRefreshing;
|
|
||||||
public bool IsRefreshing
|
|
||||||
{
|
|
||||||
get => _IsRefreshing;
|
|
||||||
set => SetProperty(ref _IsRefreshing, value);
|
|
||||||
}
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Commands
|
#region Commands
|
||||||
@ -155,8 +148,6 @@ namespace Borepin.PageModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
IsRefreshing = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private ICommand _ScanCodeCommand;
|
private ICommand _ScanCodeCommand;
|
||||||
|
@ -64,13 +64,6 @@ namespace Borepin.PageModel
|
|||||||
set => SetProperty(ref _FilteredUserListItemViewModel_List, value);
|
set => SetProperty(ref _FilteredUserListItemViewModel_List, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool _IsRefreshing;
|
|
||||||
public bool IsRefreshing
|
|
||||||
{
|
|
||||||
get => _IsRefreshing;
|
|
||||||
set => SetProperty(ref _IsRefreshing, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
private string _SearchUsername;
|
private string _SearchUsername;
|
||||||
public string SearchUsername
|
public string SearchUsername
|
||||||
{
|
{
|
||||||
@ -99,8 +92,6 @@ namespace Borepin.PageModel
|
|||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
IsRefreshing = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private ICommand _AddUserCommand;
|
private ICommand _AddUserCommand;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user