Skip to content

Commit bb4fa1c

Browse files
claudiomansillabclaudiomansillab
authored
Merge pull request #472 from alercebroker/fix/qa_fixes
Fix/qa fixes
2 parents 9bf5883 + a47a4eb commit bb4fa1c

5 files changed

Lines changed: 64 additions & 52 deletions

File tree

‎multisurveys-apis/src/object_api/services/statements_sql.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,19 @@ def create_conesearch_statement(args):
3030
def create_order_statement(query, order_args):
3131
statement = None
3232
cols = query.column_descriptions
33-
34-
for col in cols:
35-
model = col["entity"]
33+
if order_args.order_by == 'lastmjd':
34+
model = cols[1]["entity"]
3635
attr = getattr(model, order_args.order_by, None)
3736
if attr is not None:
3837
statement = attr
39-
break
40-
38+
else:
39+
for col in cols:
40+
model = col["entity"]
41+
attr = getattr(model, order_args.order_by, None)
42+
if attr is not None:
43+
statement = attr
44+
break
45+
print('statement', statement, flush=True)
4146
if order_args.order_mode == "ASC":
4247
statement = attr.asc()
4348
elif order_args.order_mode == "DESC":

‎multisurveys-apis/src/object_api/static/draw_elements.js‎

Lines changed: 47 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
11

2-
export function draw_span(text){
3-
let new_span = document.createElement("span")
4-
new_span.innerHTML = text
5-
new_span.classList.add("custom-span")
6-
7-
return new_span
2+
export function draw_span(text) {
3+
let new_span = document.createElement("span")
4+
new_span.innerHTML = text
5+
new_span.classList.add("custom-span")
6+
7+
return new_span
88
}
99

1010

11-
export function draw_close_tags(father_element, div_tag, oid, oids_arr){
12-
let newBtn = document.createElement("div")
11+
export function draw_close_tags(father_element, div_tag, oid, oids_arr) {
12+
let newBtn = document.createElement("div")
13+
14+
let svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
15+
svg.setAttribute("width", "18");
16+
svg.setAttribute("height", "18");
17+
svg.setAttribute("viewBox", "0 -960 960 960");
18+
svg.classList.add("custom-close-svg-id");
19+
20+
let path = document.createElementNS("http://www.w3.org/2000/svg", "path");
21+
path.setAttribute("d", "m336-280 144-144 144 144 56-56-144-144 144-144-56-56-144 144-144-144-56 56 144 144-144 144 56 56ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z");
1322

14-
let svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
15-
svg.setAttribute("width", "18");
16-
svg.setAttribute("height", "18");
17-
svg.setAttribute("viewBox", "0 -960 960 960");
18-
svg.classList.add("custom-close-svg-id");
19-
20-
let path = document.createElementNS("http://www.w3.org/2000/svg", "path");
21-
path.setAttribute("d", "m336-280 144-144 144 144 56-56-144-144 144-144-56-56-144 144-144-144-56 56 144 144-144 144 56 56ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z");
22-
23-
svg.appendChild(path);
24-
newBtn.appendChild(svg);
25-
newBtn.classList.add("tw-inline-block")
23+
svg.appendChild(path);
24+
newBtn.appendChild(svg);
25+
newBtn.classList.add("tw-inline-block")
2626

27-
newBtn.addEventListener("click", () =>{
28-
let index = oids_arr.indexOf(oid)
29-
let erase_tag = div_tag
27+
newBtn.addEventListener("click", () => {
28+
let index = oids_arr.indexOf(oid)
29+
let erase_tag = div_tag
3030

31-
//se modifica el arr original
32-
if(index != -1){
33-
oids_arr.splice(index, 1)
34-
}
31+
//se modifica el arr original
32+
if (index != -1) {
33+
oids_arr.splice(index, 1)
34+
}
3535

36-
father_element.removeChild(erase_tag)
37-
}, { once: true});
36+
father_element.removeChild(erase_tag)
37+
}, { once: true });
3838

39-
return newBtn
39+
return newBtn
4040
}
4141

42+
function string_separation(oids_arr) {
43+
return oids_arr[0].split(/[ .:;?!~,`"&|()<>{}\[\]\r\n/\\]+/)
44+
}
4245

43-
export function draw_oids_tags(oids_arr){
46+
export function draw_oids_tags(oids_arr) {
4447
let container = document.getElementById("oids_container")
4548

46-
for(let oid of oids_arr){
49+
if (oids_arr.length === 1) {
50+
oids_arr = string_separation(oids_arr)
51+
}
52+
53+
for (let oid of oids_arr) {
4754
let newDiv = document.createElement("div")
4855
newDiv.id = oid
4956
newDiv.classList.add("custom-oid")
@@ -55,12 +62,12 @@ export function draw_oids_tags(oids_arr){
5562
newDiv.appendChild(new_btn)
5663
container.appendChild(newDiv)
5764
}
58-
65+
5966
container.classList.remove("tw-hidden")
6067
}
6168

6269

63-
export function draw_arrow_order_table(order_mode){
70+
export function draw_arrow_order_table(order_mode) {
6471
let svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
6572
svg.id = 'selected_order_table'
6673
svg.setAttribute("viewBox", "0 -960 960 960");
@@ -71,7 +78,7 @@ export function draw_arrow_order_table(order_mode){
7178

7279
let path = document.createElementNS("http://www.w3.org/2000/svg", "path");
7380

74-
if(order_mode == 'DESC'){
81+
if (order_mode == 'DESC') {
7582
path.setAttribute("d", "M480-240 240-480l56-56 144 144v-368h80v368l144-144 56 56-240 240Z");
7683
} else {
7784
path.setAttribute("d", "M440-240v-368L296-464l-56-56 240-240 240 240-56 56-144-144v368h-80Z");
@@ -83,7 +90,7 @@ export function draw_arrow_order_table(order_mode){
8390
}
8491

8592

86-
export function draw_error_message(message){
93+
export function draw_error_message(message) {
8794
const new_Div = document.createElement('div')
8895
const new_content = document.createElement("span")
8996
const new_Btn = draw_close_button(new_Div)
@@ -99,7 +106,7 @@ export function draw_error_message(message){
99106
return new_Div
100107
}
101108

102-
export function draw_close_button(element){
109+
export function draw_close_button(element) {
103110
const btn = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
104111
btn.id = "error_message_btn"
105112
btn.classList.add("tw-cursor-pointer", "tw-inline-block")
@@ -108,15 +115,15 @@ export function draw_close_button(element){
108115
btn.setAttribute('width', '30px');
109116
btn.setAttribute('fill', '#C62828');
110117

111-
118+
112119
const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
113120
path.setAttribute('d', 'm256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z')
114121

115122
btn.appendChild(path);
116123

117124
btn.addEventListener("click", () => {
118-
element.remove()
125+
element.remove()
119126
}, { once: true })
120127

121128
return btn
122-
}
129+
}

‎multisurveys-apis/src/object_api/static/form_restore_functions.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@ function restore_survey(urlParams) {
1818

1919
}
2020

21+
function string_separation(oids_arr) {
22+
return oids_arr[0].split(/[ .:;?!~,`"&|()<>{}\[\]\r\n/\\]+/)
23+
}
24+
2125
function restore_object_id(urlParams) {
2226

2327
let oids = urlParams.getAll('oid')
24-
2528
if (oids.length === 1) {
26-
oids = oids[0].split(",")
29+
oids = string_separation(oids)
2730
}
2831
if (oids.length > 0) {
29-
3032
draw_oids_tags(oids)
3133
document.getElementById("clear_oids_btn").classList.remove("tw-hidden")
3234
}

‎multisurveys-apis/src/object_api/templates/form.html.jinja‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,10 @@
227227

228228
{{customInput(id="ra_consearch", type="number", width="tw-col-span-12 lg:tw-col-span-6 sm:tw-col-span-12", placeholder="Ra (Deg)", step="1")}}
229229

230-
231230
{{customInput(id="dec_consearch", type="number", width="tw-col-span-12 lg:tw-col-span-6 sm:tw-col-span-12", placeholder="Dec (deg)", step="1")}}
232231

233232
{{customInput(id="radius_consearch", type="number", width="tw-col-span-12", placeholder="Radius (arcsec)", step="0.00001")}}
234233

235-
236234
</div>
237235
</div>
238236

@@ -274,4 +272,4 @@ elementReady("#form-search").then((el) => {
274272
{
275273
"classifiers": {{classifiers | tojson}}
276274
}
277-
</script>
275+
</script>

‎multisurveys-apis/src/object_api/templates/objects_table.html.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
</td>
225225
<td class="tw-px-4 tw-h-[48px] tw-flex tw-justify-between tw-items-center sm:tw-table-cell sm:tw-h-[32px]">
226226
<span class="tw-font-semibold sm:tw-hidden">DeltaMJD (days)</span>
227-
<span name="deltamjd">{{"%.3f" | format(item['firstmjd'])}}</span>
227+
<span name="deltamjd">{{"%.3f" | format(item['deltamjd'])}}</span>
228228
</td>
229229
</tr>
230230
{% endfor %}

0 commit comments

Comments
 (0)