Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW Comment on survey is possible only after vote.

Browse Source
This commit is contained in:
Laurent Destailleur 2023-05-16 11:15:11 +02:00
parent ee267e45c8
commit 0ead047868
6 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -178,16 +178,18 @@ NEW: Widgets: Implement MAIN_ACTIVATE_FILECACHE on birthday widget
NEW: Widgets: Add widget "The next upcoming events"
NEW: Widgets: Add widget of open opportunities
NEW: Use an ajax component to swith prospection status on thidparty list
NEW: Comment on survey is possible only after vote.
For developers or integrators:
------------------------------
NEW: triggers on mailing
NEW: add triggers on mailing
NEW: add function for listiong objects from directory
NEW: add helplist property to describe fields of objects
NEW: add hook in loadLotStock() in html.formproduct.class.php file, add hook 'llxFooter', Add hook online sign
NEW: Update lib parsedownto 1.7.4, phpspreadsheet lib to v1.12, ESCPOS v3.0
NEW: Update lib parsedownto 1.7.4, phpspreadsheet lib to v1.12, ESCPOS v3.0, jquery, Stripe.
NEW: Support contact in post() document API
NEW: More APIs (update currency rate, upload of supplier documents, ...)
NEW: ModuleBuilder: updating in modulbuilder on tab Menu when adding object
NEW: ModuleBuilder: add/edit permissions
NEW: ModuleBuilder: better generated documentation

8
htdocs/opensurvey/card.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2023 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -254,7 +254,7 @@ if ($action == 'edit') {
print '</td></tr>';
// Description
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td class="wordbreak">';
if ($action == 'edit') {
$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
$doleditor->Create(0, '');
@ -321,7 +321,7 @@ print '</td></tr>';
print '<tr><td>';
print $langs->trans("Author").'</td><td>';
if ($object->fk_user_creat > 0) {
print $userstatic->getLoginUrl(1);
print $userstatic->getLoginUrl(-1);
} else {
if ($action == 'edit') {
print '<input type="text" name="nouvelleadresse" class="minwith200" value="'.$object->mail_admin.'">';
@ -428,7 +428,7 @@ if ($object->allow_comments) {
print $langs->trans("AddACommentForPoll").'<br>';
print '<textarea name="comment" rows="2" class="quatrevingtpercent"></textarea><br>'."\n";
print $langs->trans("Name").': <input type="text" class="minwidth300" name="commentuser" value="'.dol_escape_htmltag($user->getFullName($langs)).'"> '."\n";
print '<input type="submit" class="button reposition" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
print '<input type="submit" class="button reposition smallpaddingimp" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
}
print '</form>';

4
htdocs/opensurvey/results.php
View File

@ -481,7 +481,7 @@ if ($action == 'edit') {
print '</td></tr>';
// Description
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td class="wordbreak">';
if ($action == 'edit') {
$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
$doleditor->Create(0, '');
@ -526,7 +526,7 @@ print '</td></tr>';
print '<tr><td>';
print $langs->trans("Author").'</td><td>';
if ($object->fk_user_creat) {
print $userstatic->getLoginUrl(1);
print $userstatic->getLoginUrl(-1);
} else {
print dol_htmlentities($object->nom_admin);
}

32
htdocs/public/opensurvey/studs.php
View File

@ -332,7 +332,7 @@ $toutsujet = str_replace("°", "'", $toutsujet);
print '<div class="survey_invitation">'.$langs->trans("YouAreInivitedToVote").'</div>';
print $langs->trans("OpenSurveyHowTo").'<br>';
print '<span class="opacitymedium">'.$langs->trans("OpenSurveyHowTo").'</span><br>';
if (empty($object->allow_spy)) {
print '<span class="opacitymedium">'.$langs->trans("YourVoteIsPrivate").'</span><br>';
} else {
@ -340,17 +340,21 @@ if (empty($object->allow_spy)) {
}
print '<br>';
print '<div class="corps"> '."\n";
if (empty($object->description)) {
print '<div class="corps"> '."\n";
}
// show title of survey
$titre = str_replace("\\", "", $object->title);
print '<strong>'.dol_htmlentities($titre).'</strong>';
print '<strong>'.dol_htmlentities($titre).'</strong><br>';
if (!empty($object->description)) {
print '<br><div class="corps"> '."\n";
}
// show description of survey
if ($object->description) {
print '<br><br>'."\n";
print dol_htmlentitiesbr($object->description);
print '<br>'."\n";
}
print '</div>'."\n";
@ -465,6 +469,7 @@ if ($object->format == "D") {
// Loop on each answer
$currentusername = '';
$sumfor = array();
$sumagainst = array();
$compteur = 0;
@ -561,7 +566,7 @@ while ($compteur < $num) {
}
}
} else {
//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour saisie
if ($compteur == $ligneamodifier) {
for ($i = 0; $i < $nbcolonnes; $i++) {
$car = substr($ensemblereponses, $i, 1);
@ -650,7 +655,8 @@ while ($compteur < $num) {
// Button edit at end of line
if ($compteur != $ligneamodifier && $mod_ok) {
print '<td class="casevide"><input type="submit" class="button smallpaddingimp" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
$currentusername = $obj->name;
print '<td class="casevide"><input type="submit" class="button small" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
}
//demande de confirmation pour modification de ligne
@ -659,7 +665,7 @@ while ($compteur < $num) {
if ($compteur == $i) {
print '<td class="casevide">';
print '<input type="hidden" name="idtomodify'.$compteur.'" value="'.$obj->id_users.'">';
print '<input type="submit" class="button button-save" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
print '<input type="submit" class="button button-save small" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
print '</td>'."\n";
}
}
@ -676,7 +682,7 @@ if ($ligneamodifier < 0 && (!isset($_SESSION['nom']))) {
if (isset($_SESSION['nom'])) {
print '<input type=hidden name="nom" value="'.$_SESSION['nom'].'">'.$_SESSION['nom']."\n";
} else {
print '<input type="text" name="nom" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" maxlength="64" class=" minwidth175">'."\n";
print '<input type="text" name="nom" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" maxlength="64" class=" minwidth175" value="">'."\n";
}
print '</td>'."\n";
@ -701,7 +707,7 @@ if ($ligneamodifier < 0 && (!isset($_SESSION['nom']))) {
print '</td>'."\n";
}
// Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base
// Show button to add a new line into database
print '<td><input type="image" class="borderimp" name="boutonp" value="'.$langs->trans("Vote").'" src="'.img_picto('', 'edit_add', '', false, 1).'"></td>'."\n";
print '</tr>'."\n";
}
@ -835,13 +841,13 @@ if ($comments) {
}
// Form to add comment
if ($object->allow_comments) {
if ($object->allow_comments && $currentusername) {
print '<br><div class="addcomment"><span class="opacitymedium">'.$langs->trans("AddACommentForPoll")."</span><br>\n";
print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent">'.dol_escape_htmltag(GETPOST('comment', 'alphanohtml'), 0, 1).'</textarea><br>'."\n";
print $langs->trans("Name").': ';
print '<input type="text" name="commentuser" maxlength="64" value="'.dol_escape_htmltag(GETPOST('commentuser', 'alphanohtml')).'"> &nbsp; '."\n";
print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
print '<input type="text" name="commentuser" maxlength="64" value="'.dol_escape_htmltag(GETPOSTISSET('commentuser') ? GETPOST('commentuser', 'alphanohtml') : (empty($_SESSION['nom']) ? $currentusername : $_SESSION['nom'])).'"> &nbsp; '."\n";
print '<input type="submit" class="button smallpaddingimp" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
print '</form>'."\n";
print '</div>'."\n"; // div add comment

3
htdocs/theme/eldy/global.inc.php
View File

@ -838,6 +838,9 @@ textarea.centpercent {
.wordbreak {
word-break: break-all;
}
td.wordbreak img {
max-width: 100%;
}
.bold {
font-weight: bold !important;
}

3
htdocs/theme/md/style.css.php
View File

@ -1080,6 +1080,9 @@ textarea.centpercent {
.wordbreak {
word-break: break-all;
}
td.wordbreak img {
max-width: 100%;
}
.bold {
font-weight: bold !important;
}