feat(diary): Fixed a moderation send issue. Dynamic product moderation now works

This commit is contained in:
2024-03-29 12:44:22 +03:00
parent 2eaf096ade
commit 7cd867806c
3 changed files with 66 additions and 54 deletions

View File

@@ -84,6 +84,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
commentController: currentState.commentController, commentController: currentState.commentController,
mealTimeController: currentState.mealTimeController, mealTimeController: currentState.mealTimeController,
productNameController: currentState.productNameController, productNameController: currentState.productNameController,
caloriesController: currentState.caloriesController,
proteinsController: currentState.proteinsController,
fatsController: currentState.fatsController,
carbsController: currentState.carbsController,
selectedSatiety: currentState.selectedSatiety, selectedSatiety: currentState.selectedSatiety,
selectedMood: currentState.selectedMood, selectedMood: currentState.selectedMood,
portions: currentState.portions, portions: currentState.portions,
@@ -114,6 +118,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
TextEditingController(text: diary['comment']), TextEditingController(text: diary['comment']),
productNameController: TextEditingController(), productNameController: TextEditingController(),
productQuantityController: TextEditingController(), productQuantityController: TextEditingController(),
caloriesController: TextEditingController(),
proteinsController: TextEditingController(),
fatsController: TextEditingController(),
carbsController: TextEditingController(),
diaryId: diaryId, diaryId: diaryId,
diaryDate: diaryDate, diaryDate: diaryDate,
autocompleteList: [], autocompleteList: [],
@@ -198,6 +206,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
TextEditingController(text: diary['comment']), TextEditingController(text: diary['comment']),
productNameController: TextEditingController(), productNameController: TextEditingController(),
productQuantityController: TextEditingController(), productQuantityController: TextEditingController(),
caloriesController: TextEditingController(),
proteinsController: TextEditingController(),
fatsController: TextEditingController(),
carbsController: TextEditingController(),
diaryId: diaryId, diaryId: diaryId,
diaryDate: diaryDate, diaryDate: diaryDate,
autocompleteList: [], autocompleteList: [],
@@ -691,7 +703,10 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
currentState.token, currentState.token,
); );
print(response); if (response.statusCode == 200)
print("Moderation success");
else
print("Moderation error");
} }
} }
@@ -702,28 +717,31 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
String fats_on_100gr, String fats_on_100gr,
String carbohydrates_on_100gr, String carbohydrates_on_100gr,
String? token) async { String? token) async {
String url = final Uri url = Uri.parse(
'${dotenv.env['SERVER_ROOT']!}/diary/product_nutritional_values/sendToModeration'; '${dotenv.env['SERVER_ROOT']!}/diary/product_nutritional_values/sendToModeration');
var serverURL = Uri.parse('${dotenv.env['SERVER_ROOT']!}'); final Uri serverURL = Uri.parse('${dotenv.env['SERVER_ROOT']!}');
String host = serverURL.host; String host = serverURL.host;
final Map<String, dynamic> credentials = { final Map<String, String> credentials = {
'name': name, 'name': name,
'energy_on_100gr': energy_on_100gr, 'energy_on_100gr': energy_on_100gr,
'proteins_on_100gr': proteins_on_100gr, 'proteins_on_100gr': proteins_on_100gr,
'fats_on_100gr': fats_on_100gr, 'fats_on_100gr': fats_on_100gr,
'carbohydrates_on_100gr': carbohydrates_on_100gr, 'carbohydrates_on_100gr': carbohydrates_on_100gr,
}; };
var bodyBytes = utf8.encode(json.encode(credentials));
var headers = {
//'Content-Length': bodyBytes,
'Authorization': 'Bearer $token',
'Host': host,
};
var response = await http.post( var response = await http.post(
Uri.parse(url), url,
headers: { headers: headers,
'Content-Type': 'application/json', body: credentials,
'Content-Length': '${bodyBytes.length}', encoding: utf8,
'Authorization': 'Bearer $token',
'Host': host,
},
body: bodyBytes,
); );
if (response.statusCode == 200) { if (response.statusCode == 200) {
return response; return response;
} else { } else {

View File

@@ -33,6 +33,10 @@ class DiaryEditLoadedState extends DiaryEditState {
this.productQuantityController, this.productQuantityController,
this.selectedMood, this.selectedMood,
this.currentMeal, this.currentMeal,
this.caloriesController,
this.fatsController,
this.proteinsController,
this.carbsController,
required this.diaryId, required this.diaryId,
required this.selectedSatiety, required this.selectedSatiety,
required this.moderationExpanded, required this.moderationExpanded,
@@ -53,6 +57,10 @@ class DiaryEditLoadedState extends DiaryEditState {
TextEditingController? commentController; TextEditingController? commentController;
TextEditingController? productNameController; TextEditingController? productNameController;
TextEditingController? productQuantityController; TextEditingController? productQuantityController;
TextEditingController? caloriesController;
TextEditingController? fatsController;
TextEditingController? proteinsController;
TextEditingController? carbsController;
int? selectedMood; int? selectedMood;
int selectedSatiety; int selectedSatiety;
int diaryId; int diaryId;
@@ -72,6 +80,10 @@ class DiaryEditLoadedState extends DiaryEditState {
commentController, commentController,
productNameController, productNameController,
productQuantityController, productQuantityController,
caloriesController,
fatsController,
proteinsController,
carbsController,
selectedMood, selectedMood,
selectedSatiety, selectedSatiety,
diaryId, diaryId,
@@ -94,6 +106,10 @@ class DiaryEditLoadedState extends DiaryEditState {
TextEditingController? commentController, TextEditingController? commentController,
TextEditingController? productNameController, TextEditingController? productNameController,
TextEditingController? productQuantityController, TextEditingController? productQuantityController,
TextEditingController? caloriesController,
TextEditingController? fatsController,
TextEditingController? proteinsController,
TextEditingController? carbsController,
int? selectedMood, int? selectedMood,
int? selectedSatiety, int? selectedSatiety,
int? diaryId, int? diaryId,
@@ -120,6 +136,10 @@ class DiaryEditLoadedState extends DiaryEditState {
selectedSatiety: selectedSatiety ?? this.selectedSatiety, selectedSatiety: selectedSatiety ?? this.selectedSatiety,
diaryId: diaryId ?? this.diaryId, diaryId: diaryId ?? this.diaryId,
currentMeal: currentMeal ?? this.currentMeal, currentMeal: currentMeal ?? this.currentMeal,
caloriesController: caloriesController ?? this.caloriesController,
fatsController: fatsController ?? this.fatsController,
proteinsController: proteinsController ?? this.proteinsController,
carbsController: carbsController ?? this.carbsController,
wakeupExpanded: wakeupExpanded ?? this.wakeupExpanded, wakeupExpanded: wakeupExpanded ?? this.wakeupExpanded,
moderationExpanded: moderationExpanded ?? this.moderationExpanded, moderationExpanded: moderationExpanded ?? this.moderationExpanded,
moodExpanded: moodExpanded ?? this.moodExpanded); moodExpanded: moodExpanded ?? this.moodExpanded);

View File

@@ -309,13 +309,13 @@ class DiaryEditScreen extends StatelessWidget {
optionsBuilder: buildOptions(_options), optionsBuilder: buildOptions(_options),
fieldViewBuilder: ( fieldViewBuilder: (
BuildContext context, BuildContext context,
TextEditingController textEditingController, TextEditingController productEditingController,
FocusNode focusNodeName, FocusNode focusNodeName,
VoidCallback onFieldSubmitted, VoidCallback onFieldSubmitted,
) { ) {
return CustomTextFormField( return CustomTextFormField(
hintText: "Введите название продукта", hintText: "Введите название продукта",
controller: textEditingController, controller: productEditingController,
focusNode: focusNodeName, focusNode: focusNodeName,
onChanged: getAutocomplete(context, focusNodeQuantity), onChanged: getAutocomplete(context, focusNodeQuantity),
/*onFieldSubmitted: (String value) { /*onFieldSubmitted: (String value) {
@@ -357,7 +357,7 @@ class DiaryEditScreen extends StatelessWidget {
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 10.h), padding: EdgeInsets.symmetric(horizontal: 10.h),
child: GestureDetector( child: GestureDetector(
onTap: () => openCaloriesDialog(context), onTap: () => openCaloriesDialog(context, state),
child: Text("Отправить на модерацию"), child: Text("Отправить на модерацию"),
), ),
), ),
@@ -449,33 +449,7 @@ class DiaryEditScreen extends StatelessWidget {
)); ));
} }
openCaloriesDialog(BuildContext context) { openCaloriesDialog(BuildContext context, DiaryEditLoadedState state) {
String name = '';
String energyOn100gr = '';
String proteinsOn100gr = '';
String fatsOn100gr = '';
String carbohydratesOn100gr = '';
void onNameChanged(String value) {
name = value;
}
void onEnergyChanged(String value) {
energyOn100gr = value;
}
void onProteinsChanged(String value) {
proteinsOn100gr = value;
}
void onFatsChanged(String value) {
fatsOn100gr = value;
}
void onCarbohydratesChanged(String value) {
carbohydratesOn100gr = value;
}
showDialog( showDialog(
context: context, context: context,
builder: (BuildContext dialogContext) { builder: (BuildContext dialogContext) {
@@ -486,31 +460,31 @@ class DiaryEditScreen extends StatelessWidget {
children: [ children: [
CustomTextFormField( CustomTextFormField(
hintText: "Название", hintText: "Название",
onChanged: onNameChanged, controller: state.productNameController,
), ),
SizedBox(height: 10.v), SizedBox(height: 10.v),
CustomTextFormField( CustomTextFormField(
onChanged: onEnergyChanged,
hintText: "Энергетическая ценность на 100", hintText: "Энергетическая ценность на 100",
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
controller: state.caloriesController,
), ),
SizedBox(height: 10.v), SizedBox(height: 10.v),
CustomTextFormField( CustomTextFormField(
hintText: "Белки на 100г", hintText: "Белки на 100г",
onChanged: onProteinsChanged,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
controller: state.proteinsController,
), ),
SizedBox(height: 10.v), SizedBox(height: 10.v),
CustomTextFormField( CustomTextFormField(
hintText: "Жиры на 100г", hintText: "Жиры на 100г",
onChanged: onFatsChanged,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
controller: state.fatsController,
), ),
SizedBox(height: 10.v), SizedBox(height: 10.v),
CustomTextFormField( CustomTextFormField(
hintText: "Углеводы на 100г", hintText: "Углеводы на 100г",
onChanged: onCarbohydratesChanged,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
controller: state.carbsController,
), ),
], ],
), ),
@@ -522,11 +496,11 @@ class DiaryEditScreen extends StatelessWidget {
TextButton( TextButton(
onPressed: triggerModeration( onPressed: triggerModeration(
context, context,
name, state.productNameController!.text,
energyOn100gr, state.caloriesController!.text,
proteinsOn100gr, state.proteinsController!.text,
fatsOn100gr, state.fatsController!.text,
carbohydratesOn100gr, state.carbsController!.text,
dialogContext), dialogContext),
child: Text('Отправить'), child: Text('Отправить'),
), ),