|
@@ -48,6 +48,7 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
TextEditingController controllerNote = new TextEditingController()..text = '';
|
|
TextEditingController controllerNote = new TextEditingController()..text = '';
|
|
TextEditingController controllerLocation = new TextEditingController()..text = '';
|
|
TextEditingController controllerLocation = new TextEditingController()..text = '';
|
|
TextEditingController controllerUserId = new TextEditingController()..text = '';
|
|
TextEditingController controllerUserId = new TextEditingController()..text = '';
|
|
|
|
+ TextEditingController controllerReferenceNumber = new TextEditingController()..text = '';
|
|
|
|
|
|
FocusNode focusNodeLocation = new FocusNode();
|
|
FocusNode focusNodeLocation = new FocusNode();
|
|
double _currentSliderValue = 0;
|
|
double _currentSliderValue = 0;
|
|
@@ -406,7 +407,7 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
U.newServerVersion(1736473802) ? Column(
|
|
U.newServerVersion(1736473802) ? Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
children: [
|
|
- SizedBox(height: 36),
|
|
|
|
|
|
+ SizedBox(height: 32),
|
|
Text('changePriority'.tr(), style: TextStyle(color: textColor, fontWeight: FontWeight.w600)),
|
|
Text('changePriority'.tr(), style: TextStyle(color: textColor, fontWeight: FontWeight.w600)),
|
|
SizedBox(height: 12),
|
|
SizedBox(height: 12),
|
|
Container(
|
|
Container(
|
|
@@ -464,7 +465,35 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
)
|
|
)
|
|
)
|
|
)
|
|
],
|
|
],
|
|
- ) : SizedBox()
|
|
|
|
|
|
+ ) : SizedBox(),
|
|
|
|
+ U.newServerVersion(1741166029) ? Column(
|
|
|
|
+ crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
+ children: [
|
|
|
|
+ SizedBox(height: 32),
|
|
|
|
+ Text('referenceNumber'.tr(), style: TextStyle(color: textColor, fontWeight: FontWeight.w600)),
|
|
|
|
+ SizedBox(height: 8),
|
|
|
|
+ SizedBox(
|
|
|
|
+ width: double.infinity,
|
|
|
|
+ child: TextField(
|
|
|
|
+ controller: controllerReferenceNumber,
|
|
|
|
+ style: TextStyle(fontSize: 14, color: Colors.black),
|
|
|
|
+ decoration: InputDecoration(
|
|
|
|
+ hintText: 'enterTicketNumber'.tr(),
|
|
|
|
+ hintStyle: TextStyle(color: textColor.withValues(alpha: 0.5), fontSize: 14),
|
|
|
|
+ filled: true,
|
|
|
|
+ fillColor: backgroundColor,
|
|
|
|
+ hoverColor: Colors.black.withValues(alpha: 0.1),
|
|
|
|
+ contentPadding: EdgeInsets.all(13),
|
|
|
|
+ prefixIcon: Padding(padding: EdgeInsets.only(left: 13, right: 13), child: U.iconsax('ticket', color: textColor, size: 24)),
|
|
|
|
+ border: InputBorder.none,
|
|
|
|
+ enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(12), borderSide: BorderSide(color: Color(0xff262626).withValues(alpha: 0.5))),
|
|
|
|
+ focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(12), borderSide: const BorderSide(color: primaryColor)),
|
|
|
|
+ isDense: true
|
|
|
|
+ ),
|
|
|
|
+ ),
|
|
|
|
+ )
|
|
|
|
+ ],
|
|
|
|
+ ) : SizedBox(),
|
|
],
|
|
],
|
|
),
|
|
),
|
|
],
|
|
],
|
|
@@ -518,7 +547,7 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
if (controllerDateString.text.trim().isEmpty && widget.request['noteFormat'] == 'DATE'){
|
|
if (controllerDateString.text.trim().isEmpty && widget.request['noteFormat'] == 'DATE'){
|
|
showError(context, 'dateRequired'.tr());
|
|
showError(context, 'dateRequired'.tr());
|
|
} else {
|
|
} else {
|
|
- reqFunc.sendRequestToOthers(context, widget, controllerUserId, controllerNote, controllerLocation, controllerDateString, _currentSliderValue);
|
|
|
|
|
|
+ reqFunc.sendRequestToOthers(context, widget, controllerUserId, controllerNote, controllerReferenceNumber, controllerLocation, controllerDateString, _currentSliderValue);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
showError(context, 'idRequired'.tr());
|
|
showError(context, 'idRequired'.tr());
|
|
@@ -526,13 +555,13 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
} else if (controllerDateString.text.trim().isNotEmpty && widget.request['noteFormat'] == 'DATE'){
|
|
} else if (controllerDateString.text.trim().isNotEmpty && widget.request['noteFormat'] == 'DATE'){
|
|
dialogSendLater();
|
|
dialogSendLater();
|
|
} else {
|
|
} else {
|
|
- reqFunc.sendRequest(context, widget, controllerNote, controllerLocation, controllerDateString, _currentSliderValue);
|
|
|
|
|
|
+ reqFunc.sendRequest(context, widget, controllerNote, controllerReferenceNumber, controllerLocation, controllerDateString, _currentSliderValue);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
showError(context, 'lengthMax'.tr());
|
|
showError(context, 'lengthMax'.tr());
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- showError(context, 'locRequired'.tr()+(!kIsWeb && widget.request['scanToRequest']?' '+'pleaseScan'.tr()+'.':''));
|
|
|
|
|
|
+ showError(context, 'locRequired'.tr()+(!kIsWeb && widget.request['scanToRequest']?' ${'pleaseScan'.tr()}.':''));
|
|
}
|
|
}
|
|
})
|
|
})
|
|
],
|
|
],
|
|
@@ -582,7 +611,7 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
onTap: (){
|
|
onTap: (){
|
|
navigateBack(contexts);
|
|
navigateBack(contexts);
|
|
Provider.of<CreateSerModule>(context, listen: false).setSendLater(true);
|
|
Provider.of<CreateSerModule>(context, listen: false).setSendLater(true);
|
|
- reqFunc.sendRequest(context, widget, controllerNote, controllerLocation, controllerDateString, _currentSliderValue);
|
|
|
|
|
|
+ reqFunc.sendRequest(context, widget, controllerNote, controllerReferenceNumber, controllerLocation, controllerDateString, _currentSliderValue);
|
|
},
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
@@ -611,7 +640,7 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
),
|
|
),
|
|
onTap: (){
|
|
onTap: (){
|
|
navigateBack(contexts);
|
|
navigateBack(contexts);
|
|
- reqFunc.sendRequest(context, widget, controllerNote, controllerLocation, controllerDateString, _currentSliderValue);
|
|
|
|
|
|
+ reqFunc.sendRequest(context, widget, controllerNote, controllerReferenceNumber, controllerLocation, controllerDateString, _currentSliderValue);
|
|
},
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
@@ -622,11 +651,11 @@ class _MobReqCreatePageState extends State<MobReqCreatePage> {
|
|
SizedBox(height: 12),
|
|
SizedBox(height: 12),
|
|
Container(
|
|
Container(
|
|
padding: EdgeInsets.all(3),
|
|
padding: EdgeInsets.all(3),
|
|
- child: Text('scheduledMsg'.tr(), style: TextStyle(color: textColor, fontSize: 12, fontWeight: FontWeight.w300)),
|
|
|
|
decoration: BoxDecoration(
|
|
decoration: BoxDecoration(
|
|
color: Color(0xffCCA600).withValues(alpha: 0.2),
|
|
color: Color(0xffCCA600).withValues(alpha: 0.2),
|
|
borderRadius: BorderRadius.all(Radius.circular(3))
|
|
borderRadius: BorderRadius.all(Radius.circular(3))
|
|
),
|
|
),
|
|
|
|
+ child: Text('scheduledMsg'.tr(), style: TextStyle(color: textColor, fontSize: 12, fontWeight: FontWeight.w300)),
|
|
)
|
|
)
|
|
],
|
|
],
|
|
),
|
|
),
|