sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新到单休字段

Browse Source
This commit is contained in:
魏少阳 2024-07-29 19:30:29 +08:00
parent b687ffd154
commit f2b46b3b41
10 changed files with 90 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lan/lan_en.json
View File

@ -79,19 +79,16 @@
"常开模式": "Normal Open Mode", "常开模式": "Normal Open Mode",
"常开时间": "Normal Open Time", "常开时间": "Normal Open Time",
"常开日期": "Normal Open Date", "常开日期": "Normal Open Date",
"添加员工": "Add Employee",
"编辑员工": "Edit Employee",
"节假日": "Holidays",
"打卡方式": "Punching Mode",
"员工是否有钥匙": "If The Employee Has A Key",
"上班时间": "Office Hours",
"下班时间": "Closing Time",
"本周": "This Week",
"单休": "Single Rest",
"company": "Company",
"staff": "Staff",
"work": "Work",
"workday": "Workday",
"holidays": "Holidays",
"punchingMode": "Punching Mode",
"whetherTheEmployeeHasAKey": "If The Employee Has A Key",
"selectKey": "Select Key",
"officeHours": "Office Hours",
"closingTime": "Closing Time",
"thisWeek": "This Week",
"singleDayWeekend": "Single Day Weekend",
"twoDaysOff": "Two Days Off", "twoDaysOff": "Two Days Off",
"oddOrEvenDaysOff": "Odd Or Even Days Off", "oddOrEvenDaysOff": "Odd Or Even Days Off",
"year": "Year", "year": "Year",

21
lan/lan_keys.json
View File

@ -79,19 +79,16 @@
"常开模式":"常开模式", "常开模式":"常开模式",
"常开时间": "常开时间", "常开时间": "常开时间",
"常开日期": "常开日期", "常开日期": "常开日期",
"添加员工": "添加员工",
"编辑员工": "编辑员工",
"节假日":"节假日",
"打卡方式":"打卡方式",
"员工是否有钥匙":"员工是否有钥匙",
"上班时间":"上班时间",
"下班时间":"下班时间",
"本周": "本周",
"单休":"单休",
"company":"company",
"staff":"staff",
"work":"work",
"workday":"workday",
"holidays":"holidays",
"punchingMode":"punchingMode",
"whetherTheEmployeeHasAKey":"whetherTheEmployeeHasAKey",
"selectKey":"selectKey",
"officeHours":"officeHours",
"closingTime":"closingTime",
"thisWeek":"thisWeek",
"singleDayWeekend":"singleDayWeekend",
"twoDaysOff":"twoDaysOff", "twoDaysOff":"twoDaysOff",
"oddOrEvenDaysOff":"oddOrEvenDaysOff", "oddOrEvenDaysOff":"oddOrEvenDaysOff",
"year":"year", "year":"year",

22
lan/lan_zh.json
View File

@ -79,19 +79,16 @@
"常开模式": "常开模式", "常开模式": "常开模式",
"常开时间": "常开时间", "常开时间": "常开时间",
"常开日期": "常开日期", "常开日期": "常开日期",
"添加员工": "添加员工",
"编辑员工": "编辑员工",
"节假日": "节假日",
"打卡方式": "打卡方式",
"员工是否有钥匙": "员工是否有钥匙",
"上班时间": "上班时间",
"下班时间": "下班时间",
"本周": "本周",
"单休": "单休",
"company": "公司",
"staff": "员工",
"work": "工作",
"workday": "工作日",
"holidays": "节假日",
"punchingMode": "打卡方式",
"whetherTheEmployeeHasAKey": "员工是否有钥匙",
"selectKey": "选择钥匙",
"officeHours": "上班时间",
"closingTime": "下班时间",
"thisWeek": "本周",
"singleDayWeekend": "单休",
"twoDaysOff": "双休", "twoDaysOff": "双休",
"oddOrEvenDaysOff": "单双休", "oddOrEvenDaysOff": "单双休",
"year": "年", "year": "年",
@ -440,6 +437,7 @@
"judgmentMethodContent": "人站在屋外，面向入户门。\n如果门的合页或门轴在左边，则门是左开；\n如果门的合页或门轴在右边，则门是右开。\n如果设置错误，将无法正常开关门。\n建议由安装或维修人员操作。", "judgmentMethodContent": "人站在屋外，面向入户门。\n如果门的合页或门轴在左边，则门是左开；\n如果门的合页或门轴在右边，则门是右开。\n如果设置错误，将无法正常开关门。\n建议由安装或维修人员操作。",
"customMode": "自定义模式", "customMode": "自定义模式",
"videoSlot": "录像时段", "videoSlot": "录像时段",
"密码": "密码", "密码": "密码",
"卡": "卡", "卡": "卡",
"指纹": "指纹", "指纹": "指纹",

7
lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart
View File

@ -48,7 +48,7 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
showCupertinoAlertDialog(context); showCupertinoAlertDialog(context);
})), })),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.staff!.tr, leftTitel: '员工'.tr,
rightTitle: state.staffNumber.value, rightTitle: state.staffNumber.value,
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
@ -75,8 +75,7 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
} }
})), })),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: leftTitel: '工作日设置'.tr,
'${TranslationLoader.lanKeys!.workday!.tr}${TranslationLoader.lanKeys!.set!.tr}',
rightTitle: state.isCustom.value == true ? state.weekDaysStr.value : (state.weekDays.value.length == 6 ? '单休' : '双休'), rightTitle: state.isCustom.value == true ? state.weekDaysStr.value : (state.weekDays.value.length == 6 ? '单休' : '双休'),
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
@ -96,7 +95,7 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
} }
})), })),
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.holidays!.tr, leftTitel: '节假日'.tr,
rightTitle: '', rightTitle: '',
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,

4
lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart
View File

@ -42,7 +42,7 @@ class _CheckingInSetWorkTimePageState extends State<CheckingInSetWorkTimePage> {
return Column( return Column(
children: <Widget>[ children: <Widget>[
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.officeHours!.tr, leftTitel: '上班时间'.tr,
rightTitle: state.beginTime.value, rightTitle: state.beginTime.value,
isHaveDirection: true, isHaveDirection: true,
isHaveLine: true, isHaveLine: true,
@ -59,7 +59,7 @@ class _CheckingInSetWorkTimePageState extends State<CheckingInSetWorkTimePage> {
}); });
})), })),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.closingTime!.tr, leftTitel: '下班时间'.tr,
rightTitle: state.endTime.value, rightTitle: state.endTime.value,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {

7
lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart
View File

@ -27,8 +27,7 @@ class _CheckingInSetWorkdaySetState extends State<CheckingInSetWorkdaySet> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar( appBar: TitleAppBar(
barTitle: barTitle: '工作日设置'.tr,
'${TranslationLoader.lanKeys!.workday!.tr} ${TranslationLoader.lanKeys!.set!.tr}',
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor), backgroundColor: AppColors.mainColor),
body: ListView( body: ListView(
@ -120,12 +119,12 @@ class _CheckingInSetWorkdaySetState extends State<CheckingInSetWorkdaySet> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
CommonItem( CommonItem(
leftTitel: TranslationLoader.lanKeys!.thisWeek!.tr, leftTitel: '本周'.tr,
rightTitle: '', rightTitle: '',
allHeight: 60.h, allHeight: 60.h,
isHaveLine: true), isHaveLine: true),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.singleDayWeekend!.tr, leftTitel: '单休'.tr,
rightTitle: '', rightTitle: '',
allHeight: 60.h, allHeight: 60.h,
isHaveLine: true, isHaveLine: true,

7
lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart
View File

@ -33,8 +33,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.mainBackgroundColor, backgroundColor: AppColors.mainBackgroundColor,
appBar: TitleAppBar( appBar: TitleAppBar(
barTitle: barTitle: state.isAdd.value == '1' ? '添加员工'.tr : '编辑员工'.tr,
"${state.isAdd.value == "1" ? '添加'.tr : "编辑".tr}${TranslationLoader.lanKeys!.staff!.tr}",
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor), backgroundColor: AppColors.mainColor),
body: Column( body: Column(
@ -50,7 +49,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
state.staffNameController)), state.staffNameController)),
// 选择打卡方式 // 选择打卡方式
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.punchingMode!.tr, leftTitel: '打卡方式'.tr,
rightTitle: state.selectPrintingMethodStr.value, rightTitle: state.selectPrintingMethodStr.value,
isHaveLine: false, isHaveLine: false,
isHaveDirection: true, isHaveDirection: true,
@ -425,7 +424,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
String title = ''; String title = '';
switch (int.parse(state.selectPrintingMethodType.value)) { switch (int.parse(state.selectPrintingMethodType.value)) {
case 1: case 1:
title = TranslationLoader.lanKeys!.whetherTheEmployeeHasAKey!.tr; title = '员工是否有钥匙'.tr;
break; break;
case 2: case 2:
title = TranslationLoader.lanKeys!.whetherTheEmployeeHasPassword!.tr; title = TranslationLoader.lanKeys!.whetherTheEmployeeHasPassword!.tr;

2
lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart
View File

@ -34,7 +34,7 @@ class _CheckingInStaffListPageState extends State<CheckingInStaffListPage> {
return Scaffold( return Scaffold(
backgroundColor: AppColors.greyBackgroundColor, backgroundColor: AppColors.greyBackgroundColor,
appBar: TitleAppBar( appBar: TitleAppBar(
barTitle: TranslationLoader.lanKeys!.staff!.tr, barTitle: '员工'.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor, backgroundColor: AppColors.mainColor,
actionsList: <Widget>[ actionsList: <Widget>[

2
lib/main/lockDetail/checkingIn/checkingInStaff/checkingInStaffDetail/checkingInStaffDetail_page.dart
View File

@ -53,7 +53,7 @@ class _CheckingInStaffDetailPageState extends State<CheckingInStaffDetailPage> {
rightTitle: state.staffListItemData.value.staffName, rightTitle: state.staffListItemData.value.staffName,
isHaveLine: true)), isHaveLine: true)),
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: TranslationLoader.lanKeys!.punchingMode!.tr, leftTitel: '打卡方式'.tr,
rightTitle: state.attendanceType.value, rightTitle: state.attendanceType.value,
isHaveLine: true)), isHaveLine: true)),
// Obx(() => CommonItem( // Obx(() => CommonItem(

97
lib/translations/lanKeyEntity.dart
View File

@ -160,18 +160,18 @@ class LanKeyEntity {
this.upgrade, this.upgrade,
this.leisure, this.leisure,
this.checkedIn, this.checkedIn,
this.company, // this.company,
this.staff, // this.staff,
this.work, // this.work,
this.workday, // this.workday,
this.holidays, // this.holidays,
this.punchingMode, // this.punchingMode,
this.whetherTheEmployeeHasAKey, // this.whetherTheEmployeeHasAKey,
this.selectKey, // this.selectKey,
this.officeHours, // this.officeHours,
this.closingTime, // this.closingTime,
this.thisWeek, // this.thisWeek,
this.singleDayWeekend, // this.singleDayWeekend,
this.twoDaysOff, this.twoDaysOff,
this.oddOrEvenDaysOff, this.oddOrEvenDaysOff,
this.year, this.year,
@ -623,18 +623,19 @@ class LanKeyEntity {
// earlyArrivalList = json['earlyArrivalList']; // earlyArrivalList = json['earlyArrivalList'];
// lateList = json['lateList']; // lateList = json['lateList'];
// hardWorkingList = json['hardWorkingList']; // hardWorkingList = json['hardWorkingList'];
company = json['company']; // company = json['company'];
staff = json['staff']; // staff = json['staff'];
work = json['work']; // work = json['work'];
workday = json['workday']; // workday = json['workday'];
holidays = json['holidays']; // holidays = json['holidays'];
punchingMode = json['punchingMode']; // punchingMode = json['punchingMode'];
whetherTheEmployeeHasAKey = json['whetherTheEmployeeHasAKey']; // whetherTheEmployeeHasAKey = json['whetherTheEmployeeHasAKey'];
selectKey = json['selectKey']; // selectKey = json['selectKey'];
officeHours = json['officeHours']; // officeHours = json['officeHours'];
closingTime = json['closingTime']; // closingTime = json['closingTime'];
thisWeek = json['thisWeek']; // thisWeek = json['thisWeek'];
singleDayWeekend = json['singleDayWeekend']; // singleDayWeekend = json['singleDayWeekend'];
twoDaysOff = json['twoDaysOff']; twoDaysOff = json['twoDaysOff'];
oddOrEvenDaysOff = json['oddOrEvenDaysOff']; oddOrEvenDaysOff = json['oddOrEvenDaysOff'];
year = json['year']; year = json['year'];
@ -1091,18 +1092,18 @@ class LanKeyEntity {
// String? earlyArrivalList; // String? earlyArrivalList;
// String? lateList; // String? lateList;
// String? hardWorkingList; // String? hardWorkingList;
String? company; // String? company;
String? staff; // String? staff;
String? work; // String? work;
String? workday; // String? workday;
String? holidays; // String? holidays;
String? punchingMode; // String? punchingMode;
String? whetherTheEmployeeHasAKey; // String? whetherTheEmployeeHasAKey;
String? selectKey; // String? selectKey;
String? officeHours; // String? officeHours;
String? closingTime; // String? closingTime;
String? thisWeek; // String? thisWeek;
String? singleDayWeekend; // String? singleDayWeekend;
String? twoDaysOff; String? twoDaysOff;
String? oddOrEvenDaysOff; String? oddOrEvenDaysOff;
String? year; String? year;
@ -1629,18 +1630,18 @@ class LanKeyEntity {
map['nearbyEquipment'] = nearbyEquipment; map['nearbyEquipment'] = nearbyEquipment;
map['noData'] = noData; map['noData'] = noData;
map['doorMagneticListTopTip'] = doorMagneticListTopTip; map['doorMagneticListTopTip'] = doorMagneticListTopTip;
map['company'] = company; // map['company'] = company;
map['staff'] = staff; // map['staff'] = staff;
map['work'] = work; // map['work'] = work;
map['workday'] = workday; // map['workday'] = workday;
map['holidays'] = holidays; // map['holidays'] = holidays;
map['punchingMode'] = punchingMode; // map['punchingMode'] = punchingMode;
map['whetherTheEmployeeHasAKey'] = whetherTheEmployeeHasAKey; // map['whetherTheEmployeeHasAKey'] = whetherTheEmployeeHasAKey;
map['selectKey'] = selectKey; // map['selectKey'] = selectKey;
map['officeHours'] = officeHours; // map['officeHours'] = officeHours;
map['closingTime'] = closingTime; // map['closingTime'] = closingTime;
map['thisWeek'] = thisWeek; // map['thisWeek'] = thisWeek;
map['singleDayWeekend'] = singleDayWeekend; // map['singleDayWeekend'] = singleDayWeekend;
map['twoDaysOff'] = twoDaysOff; map['twoDaysOff'] = twoDaysOff;
map['oddOrEvenDaysOff'] = oddOrEvenDaysOff; map['oddOrEvenDaysOff'] = oddOrEvenDaysOff;
map['year'] = year; map['year'] = year;