merge conflict resolve.

lib/modules/traf_module/traf_request_detail_page.dart

@@ -125,8 +125,8 @@ class _TrafRequestDetailPageState extends State<TrafRequestDetailPage> {
           4.height,
           'Requested Quantity: ${data.qty ?? '-'}'.bodyText(context), //todo @waseem replace with infotext
         ],
-        InfoTextWidget(label: 'How would the requested technology solve the current situation and/or serve the purpose?', value: "\n" + data.purposeAnswer ?? '-'),
-        InfoTextWidget(label: 'What is the current practice?', value: "\n" + data?.currentPractise ?? '-'),
+        InfoTextWidget(label: 'How would the requested technology solve the current situation and/or serve the purpose?', value: "\n${data.purposeAnswer ?? '-'}"),
+        InfoTextWidget(label: 'What is the current practice?', value: "\n${data.currentPractise ?? '-'}"),
         InfoTextWidget(label: 'Census Q1', value: data.censusQ1 ?? '-'),
         InfoTextWidget(label: 'Census Q2', value: data.censusQ2 ?? '-'),
         InfoTextWidget(label: 'Census Q3', value: data.censusQ3 ?? '-'),
@@ -136,15 +136,15 @@ class _TrafRequestDetailPageState extends State<TrafRequestDetailPage> {
             value: "\n${data.trafContacts?.map((item) => item.name).toList().toString() ?? '-'}"),
         InfoTextWidget(label: 'Is the requesting department going to use the technology solely or shared with other departments?', value: "\n${data.usingSolelyOrSharedName ?? '-'}"),
         if ((data.departments ?? []).isNotEmpty) ...[
-          InfoTextWidget(label: 'Technology used with other departments', value:"\n" + data.departments?.map((item) => item.departmentName).toList().toString() ?? '-'),
+          InfoTextWidget(label: 'Technology used with other departments', value: "\n${data.departments?.map((item) => item.departmentName).toList().toString() ?? '-'}"),
         ],
-        InfoTextWidget(label: 'Would other services be effected by acquiring the new equipment?', value: "\n" +data.isEffectedName ?? '-'),
+        InfoTextWidget(label: 'Would other services be effected by acquiring the new equipment?', value: "\n${data.isEffectedName ?? '-'}"),
         if ((data.effectedServices ?? "").isNotEmpty) ...[
-          InfoTextWidget(label: 'List of services would it be effected', value:"\n" + data.effectedServices ?? '-'),
+          InfoTextWidget(label: 'List of services would it be effected', value: "\n${data.effectedServices ?? '-'}"),
         ],
-        InfoTextWidget(label: 'Is the equipment going to be used with combination of other equipment to accomplish a specific procedure?', value:"\n" + data.isCombinationName ?? '-'),
+        InfoTextWidget(label: 'Is the equipment going to be used with combination of other equipment to accomplish a specific procedure?', value: "\n${data.isCombinationName ?? '-'}"),
         if ((data.usedWithCombination ?? "").isNotEmpty) ...[
-          InfoTextWidget(label: 'Equipment going to be used with combination of other equipments', value:"\n" + data.usedWithCombination ?? '-'),
+          InfoTextWidget(label: 'Equipment going to be used with combination of other equipments', value: "\n${data.usedWithCombination ?? '-'}"),
         ],
         if (_attachments.isNotEmpty) ...[
           4.height,