Skip to content

Commit

Permalink
Fixed issue #18693: Using checkbox question for yes/no loses data whe…
Browse files Browse the repository at this point in the history
…n data entry view (#3018)

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

- Fix Data Entry crash with debug=2

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Revert "Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view"

This reverts commit 2e2edc9.

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18659: cannot install two plugins in a row

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

- Fix after merge

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

- Fix bug when last question has subquestions ( === false)
- Don't throw exception when Unseen is checked and a value is provided

* Fixed issue #18693: Using checkbox question for yes/no loses data when data entry view

- Fix file changed by mistake

---------

Co-authored-by: lapiudevgit <devgit@lapiu.biz>
  • Loading branch information
gabrieljenik and lapiudevgit committed Jun 14, 2023
1 parent 6a8c106 commit 3ee692c
Show file tree
Hide file tree
Showing 10 changed files with 29,652 additions and 35,837 deletions.
581 changes: 337 additions & 244 deletions application/controllers/admin/DataEntry.php

Large diffs are not rendered by default.

Expand Up @@ -3490,4 +3490,79 @@ html[dir="rtl"] th {
#rel-eq-th, td.relevance-equation {
display: none;
}
}

/** Styles for Data Entry screen */
#responsedetail {
.checkbox {
input[type="checkbox"] {
margin-left: 0;
}
label {
padding-left: 0px;
}
}

.answer-item {
display:flex;
gap:1em;
margin-bottom: 1em;
}

.checkbox.unseen-checkbox {
margin-top: 0;
min-width: 6em;
}

.checkbox:not(.unseen-checkbox) {
margin-top: 0;
}

tr.multiple-opt-comments {
input[type="text"] {
width: 100%;
}
.checkbox {
margin-bottom: 0;
}
.answer-wrapper {
display: flex;
flex-wrap: wrap;
gap: .5em;
}
}

tr.array-5-pt,
tr.array-10-pt,
tr.array-yes-uncertain-no,
tr.array-increase-same-decrease,
tr.array-flexible-row,
tr.array-flexible-column,
tr.array-flexible-dual-scale {
.answer-wrapper {
display: flex;
gap: 1em;
}
.answer-wrapper > span {
flex: 1;
}
.answer-wrapper > span:first-of-type {
text-align: end;
}
}

tr.array-multi-flexi,
tr.array-multi-flexi-text {
.answer-wrapper {
display: flex;
gap: 1em;
}
.answer-wrapper > span {
flex: 1;
}
}

.answer-wrapper {
flex-grow: 1;
}
}

0 comments on commit 3ee692c

Please sign in to comment.