opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +10 -7
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70cda5a553 - Show all commits

2
app/static/css/assiduites.css
View File

@ -315,7 +315,7 @@
padding: 20px;
border: 1px solid #888;
width: 80%;
height: 40%;
height: 320px;
position: relative;
border-radius: 10px;

6
app/templates/assiduites/widgets/conflict.j2
View File

@ -129,6 +129,7 @@
</div>
<div class="action-buttons">
<button id="finish" class="btnPrompt">Terminer la résolution</button>
<button id="delete" class="btnPrompt" disabled>Supprimer</button>
<button id="split" class="btnPrompt" disabled>Séparer</button>
<button id="edit" class="btnPrompt" disabled>Modifier l'état</button>
@ -157,6 +158,7 @@
this.deleteBtn.addEventListener('click', () => { this.deleteAssiduiteModal() });
this.editBtn.addEventListener('click', () => { this.editAssiduiteModal() });
this.splitBtn.addEventListener('click', () => { this.splitAssiduiteModal() });
document.querySelector("#myModal #finish").addEventListener('click', () => { this.close() })
document.querySelector('#myModal .close').addEventListener('click', () => { this.close() })
@ -311,7 +313,7 @@
}
};
openPromptModal("Entrée demandée", fieldSet, success, () => { }, "#37f05f");
openPromptModal("Séparation de l'assiduité sélectionnée", fieldSet, success, () => { }, "#23aa40");
}
/**
@ -355,7 +357,7 @@
};
//Affichage du prompt
openPromptModal("Entrée demandée", fieldSet, success, () => { }, "#37f05f");
openPromptModal("Modification de l'état de l'assiduité sélectionnée", fieldSet, success, () => { }, "#23aa40");
}
/**

5
app/templates/assiduites/widgets/prompt.j2
View File

@ -149,9 +149,10 @@
}
.btnPrompt:disabled {
opacity: 0.7;
color: black;
opacity: 0.8;
background-color: whitesmoke;
background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, rgba(81, 81, 81, 0.61) 5px, rgba(81, 81, 81, 0.61) 10px)
background-image: repeating-linear-gradient(135deg, transparent, transparent 5px, rgba(81, 81, 81, 0.337) 5px, rgba(81, 81, 81, 0.337) 10px)
}
</style>

4
app/views/assiduites.py
View File

@ -935,6 +935,6 @@ def _get_etuds_dem_def(formsemestre):
json_str += template.replace("£", str(etud[0])).replace("$", etud[1])
if json_str != "{":
json_str = json_str[:-1] + "}"
json_str = json_str[:-1]
return json_str
return json_str + "}"