add SGQ code to questions selector, proper questions list order

[Alex]

common for quota.php and quotarow.php :
1. tables with quotas show only SGQ code for questions, selector shows only question description, so when we need to add/edit/view/delete quota we have to guess what is the question code / description for it.
Suggest to add SGQ code to questions selector

2. current questions sort order doesn't reflect questionnaire questions sequence, query order requires modifications

To fix: replace parts of querries (starting row 420 in quotarow.php, row 180 in quota.php ) in both files

To add SGQ to selector replace " CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ': ', lq.question) END as description, "

With " CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END, ' -> ' , CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ' : ', lq.question) END) as description, "

To change sort order replace " ORDER BY g.group_order ASC, lq.question_order ASC "

With " ORDER BY CASE WHEN lq2.question_order IS NULL THEN lq.question_order ELSE lq2.question_order + (lq.question_order / 1000) END ASC "

[Alex (ddrmoscow)]

The same SGQ story with questionnaireprefill.php

To show SGQ code in selector change
" CASE WHEN qo.question IS NULL THEN q.question ELSE CONCAT(qo.question,' : ',q.question) END as description "
to
" CONCAT( q.sid, 'X', q.gid, 'X', q.qid, ' -> ' , CASE WHEN qo.question IS NULL THEN q.question ELSE CONCAT(qo.question,' : ',q.question) END) as description "