Skip to content

fix: [3] Si pas de bouton pour recuperer le detail, ajoute un message… #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
finalspy wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: [3] Si pas de bouton pour recuperer le detail, ajoute un message… #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c6146c
fix: [3] Si pas de bouton pour recuperer le detail, ajoute un message…
finalspy Jun 19, 2023
46c17ea
fix: [3] Erreur sur commit precedent pour affichage message detail
finalspy Jun 21, 2023
7c7ab35
fix: [3] corrects bad prefix in selector
finalspy Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 49 additions & 36 deletions ParcourSimple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==UserScript==
// @name ParcourSimple
// @namespace https://ypetit.net/
// @version 0.8.2
// @version 0.8.5
// @description Simplification de l'affichage des voeux en attente sur ParcourSup!
// @author ypetit
// @license GNU GPLv3
Expand Down Expand Up @@ -224,12 +224,19 @@
return this;
};

setMessage(_message) {
this.message = _message;
return this;
};

show() {
let ligne = "<tr>";
ligne += "<td>" + this.school + "</td>";
ligne += "<td>" + this.course + "</td>";
if (this.error) {
ligne += "<td colspan='7'>Une erreur est survenue, classement indisponible dans ParcourSimple :(</td>";
} else if (this.message) {
ligne += "<td colspan='7'>" + this.message + "</td>";
} else {
ligne += "<td class='right'>" + this.places + "</td>";
ligne += "<td class='right'>" + (Number.isNaN(this.lastLastYear) ? "???" : this.lastLastYear) + "</td>";
Expand Down Expand Up @@ -268,41 +275,47 @@
const school = card.querySelectorAll('.psup-wish-card__school')[0].innerHTML;
const course = card.querySelectorAll('.psup-wish-card__course')[0].innerHTML;
try {
const onclick = card.querySelectorAll('button')[0].getAttribute('onclick');
const id = onclick.substring(onclick.indexOf("&") + 1, onclick.lastIndexOf("'"));
const URL = "admissions?ACTION=2&" + id + "&frOpened=false&frJsModalButton=true";
promises.push($.ajax({
url: URL,
type: "GET",
dataType: "html",
success: function (h) {
const template = document.createElement('div');
template.innerHTML = h.trim();
const waiting_position = template.querySelector("div ul li:nth-child(1) b").innerHTML;
const waiting_total = template.querySelector("div ul li:nth-child(2) b").innerHTML;
// --------------
const places = template.querySelector(".fr-alert ul li:nth-child(1) b").innerHTML;
const ranking = template.querySelector(".fr-alert ul li:nth-child(2) p b").innerHTML;
const last = template.querySelector(".fr-alert ul li:nth-child(3) b").innerHTML;
const lastYear = template.querySelector(".fr-alert ul li:nth-child(4) b");
const lastLastYear = (lastYear) ? lastYear.innerHTML : "?";
wishes.push(new Wish(school,
course,
id,
waiting_position,
waiting_total,
places,
ranking,
last,
lastLastYear
));
},
error: function (h) {
console.err(h);
},
complete: function () {
}
}));
const buttons = card.querySelectorAll('button');
if (buttons.length > 0) {
const onclick = buttons[0].getAttribute('onclick');
const id = onclick.substring(onclick.indexOf("&") + 1, onclick.lastIndexOf("'"));
const URL = "admissions?ACTION=2&" + id + "&frOpened=false&frJsModalButton=true";
promises.push($.ajax({
url: URL,
type: "GET",
dataType: "html",
success: function (h) {
const template = document.createElement('div');
template.innerHTML = h.trim();
const waiting_position = template.querySelector("div ul li:nth-child(1) b").innerHTML;
const waiting_total = template.querySelector("div ul li:nth-child(2) b").innerHTML;
// --------------
const places = template.querySelector(".fr-alert ul li:nth-child(1) b").innerHTML;
const ranking = template.querySelector(".fr-alert ul li:nth-child(2) p b").innerHTML;
const last = template.querySelector(".fr-alert ul li:nth-child(3) b").innerHTML;
const lastYear = template.querySelector(".fr-alert ul li:nth-child(4) b");
const lastLastYear = (lastYear) ? lastYear.innerHTML : "?";
wishes.push(new Wish(school,
course,
id,
waiting_position,
waiting_total,
places,
ranking,
last,
lastLastYear
));
},
error: function (h) {
console.err(h);
},
complete: function () {
}
}));
} else {
// apprentissage ? essaye afficher details
wishes.push(new Wish(school, course).setMessage(card.querySelectorAll(".psup-wish-card__detail")[0].innerText));
}
} catch (error) {
// log the error in the console
console.log(error);
Expand Down