Commit 7e0ad93d authored by Jayasith H.B.C's avatar Jayasith H.B.C

fix file submission issue

parent 9fa8abcb
No preview for this file type
......@@ -17,23 +17,21 @@ submission = Blueprint('submissions', __name__, url_prefix='/api/v1/submissions'
def upload_submission():
user_id = 1
# image = request.files['file']
a = request.get_json()
json_data = request.get_json()
submission_type = json_data['type']
assignment_id = json_data['id']
comment = json_data['comment']
image = json_data['file']
if submission_type is None or image is None or assignment_id is None:
image = request.files['file']
# json_data = json.loads(request.form['jsondata'])
# submission_type = json_data['type']
# assignment_id = json_data['id']
# comment = json_data['comment']
if image is None:
return jsonify({'err': 'invalid request '}), HTTP_400_BAD_REQUEST
elif submission_type == 'use case':
use_case_obj = save_submission(assignment_id, image, submission_type, comment, user_id)
elif image.filename == 'usecase.jpg':
use_case_obj = save_submission(1, image, "use case", "comment", user_id)
model_object_detection(image.filename, use_case_obj.id)
return jsonify({'message': 'upload successful '}), HTTP_200_OK
elif submission_type == 'class':
class_obj = save_submission(assignment_id, image, submission_type, comment, user_id)
elif image.filename == 'class.jpg':
class_obj = save_submission(1, image, "class", "comment", user_id)
component_separation(image.filename, class_obj.id)
return jsonify({'id': str(class_obj.id)}), HTTP_200_OK
else:
......
......@@ -29,7 +29,8 @@ const StudentSubjectAssingment = () => {
const [Id, setId] = useState("");
const [ItemName, setItemName] = useState("");
const [Description, setDescription] = useState("");
const [data, setData] = useState({file:null,id:"1",comment:"comment",type:"use case"});
const [data, setData] = useState({id:"1",comment:"comment",type:"use case"});
const [file, setFile] = useState(null);
const [Order, setOrder] = useState({
item: {},
......@@ -52,15 +53,24 @@ const StudentSubjectAssingment = () => {
}
};
const fileHandler = (e) =>{
const selectedFile = e.target.files[0];
setFile(selectedFile);
}
useEffect(() => {
FetchData();
}, []);
const upload = async (e) => {
console.log(data);
console.log(file);
try {
console.log(data);
const res = await axios.post("/submissions/upload", data);
const formData = new FormData();
formData.append("jsondata", data);
formData.append("file", file);
console.log(formData);
const res = await axios.post("/submissions/upload", formData);
if (res.statusText === "OK") {
console.log(res.data);
}
......@@ -241,9 +251,7 @@ const StudentSubjectAssingment = () => {
style={{ float: "right" }}
accept=".png, .jpg, .jpeg"
type="file"
onChange={(e) =>
setData({...data, file:e.target.value})
}
onChange={fileHandler}
required
/>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment