Skip to content

Commit

Permalink
Upload bulkdata on Study level : Using Edit Attributes and then uploa…
Browse files Browse the repository at this point in the history 
…ding the file sends incorrect attribute values in request payload #2794
  • Loading branch information
@shral
shral committed Oct 6, 2020
1 parent 112952e commit 013e236
Showing 1 changed file with 5 additions and 117 deletions.
122 changes: 5 additions & 117 deletions dcm4chee-arc-ui2/src/app/widgets/dialogs/upload-files/upload-files.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,13 +448,13 @@ export class UploadFilesComponent implements OnInit {
]
};
if(this.mode === "series" && _.hasIn(studyObject, "00201209.Value[0]")){
studyObject["00200011"] = { // "00200011":$localize `:@@upload-files.series_number:Series Number`
studyObject["00200011"] = studyObject["00200011"] || { // "00200011":$localize `:@@upload-files.series_number:Series Number`
"vr": "IS",
"Value": [
_.get(studyObject, "00201209.Value[0]")*1 + 1
]
};
studyObject["00200013"] = { //"00200013":$localize `:@@instance_number:Instance Number`
studyObject["00200013"] = studyObject["00200013"] || { //"00200013":$localize `:@@instance_number:Instance Number`
"vr": "IS",
"Value": [
_.get(studyObject, "00201209.Value[0]")*1 + i*1 + 1
Expand All @@ -475,136 +475,24 @@ export class UploadFilesComponent implements OnInit {
};
}
if (_.hasIn(studyObject, "0020000D.Value[0]") && this.mode != "series") {
studyObject["0020000E"] = { ///"0020000E":$localize `:@@upload-files.series_instance_uid:Series Instance UID` //Decides if the file in the same series appear
studyObject["0020000E"] = studyObject["0020000E"] || { ///"0020000E":$localize `:@@upload-files.series_instance_uid:Series Instance UID` //Decides if the file in the same series appear
"vr": "UI",
"Value": [
seriesInstanceUID
]
};
}else{
if(!_.hasIn(studyObject, "0020000E.Value[0]")){
studyObject["0020000D"] = {
studyObject["0020000D"] = studyObject["0020000D"] || {
"vr": "UI",
"Value": [
seriesInstanceUID
]
};
}
}
/* if (!_.hasIn(studyObject, "00080020.Value[0]")) { // Study Date
studyObject["00080020"] = {
"vr": "DA",
"Value": [
]
};
}
if (!_.hasIn(studyObject, "00080030.Value[0]")) { // Study Time
studyObject["00080030"] = {
"vr": "TM",
"Value": [
]
};
}
if (!_.hasIn(studyObject, "00080090.Value[0]")) { // Referring Physician's Name
studyObject["00080090"] = {
"vr": "PN",
"Value": [
]
};
}
if (!_.hasIn(studyObject, "00200010.Value[0]")) { // Study ID
studyObject["00200010"] = {
"vr": "SH",
"Value": [
]
};
}
if (!_.hasIn(studyObject, "00080050.Value[0]")) { // Accession Number
studyObject["00080050"] = {
"vr": "SH",
"Value": [
]
};
}*/
/* studyObject["00080018"] = {
"vr": "UI",
"Value": [
j4care.generateOIDFromUUID()
]
};*/

/* if (file.type === "application/pdf") {
studyObject["00420011"] = {
"vr": "OB",
"BulkDataURI": "file/" + file.name
};
studyObject["00080016"] = {
"vr": "UI",
"Value": [
"1.2.840.10008.5.1.4.1.1.104.1"
]
}
studyObject["00280301"] = {
"vr": "CS",
"Value": [
"YES"
]
};
studyObject["00420012"] = {
"vr": "LO",
"Value": [
"application/pdf"
]
};
studyObject["00420010"] = {
"vr": "ST",
"Value": [
$this.description
]
};
} else {
if (file.type.indexOf("video") > -1) {
studyObject["00080016"] = {
"vr": "UI",
"Value": [
"1.2.840.10008.5.1.4.1.1.77.1.4.1"
]
}
} else {
studyObject["00080016"] = {
"vr": "UI",
"Value": [
$this.selectedSopClass.value
]
}
}
studyObject["7FE00010"] = {
"vr": "OB",
"BulkDataURI": "file/" + file.name
}
// transfareSyntax = ';transfer-syntax=' + transfareSyntax;
}
if (file.type === "image/jpeg") {
studyObject["00080008"] = {
"vr": "CS",
"Value": [
"ORIGINAL",
"PRIMARY"
]
};
if (this.selectedSopClass.value === '1.2.840.10008.5.1.4.1.1.7') {
studyObject["00080064"] = {
"vr": "CS",
"Value": [
"WSD"
]
};
studyObject["00200020"] = {
"vr": "CS"
};
}
}*/
studyObject["00080060"] = {
studyObject["00080060"] = studyObject["00080060"] || {
"vr": "CS",
"Value": [
$this.modality
Expand Down

0 comments on commit 013e236

Please sign in to comment.