diff --git a/app/Http/Controllers/UnityController.php b/app/Http/Controllers/UnityController.php deleted file mode 100644 index 945e386..0000000 --- a/app/Http/Controllers/UnityController.php +++ /dev/null @@ -1,249 +0,0 @@ -roleid=='student/unitycourse') { - $check=\App\User::find(Auth::user()->id); - if ($check->status!='active') return view('student/unitycourse/home')->with(['status'=>$check->status]); - } - $topiclist=\App\UnityTopic::where('status','=','1') - ->orderBy('name','asc')->get(); - - $items = \App\UnityTopic::where('status','=','1') - ->orderBy('status','desc') - ->orderBy('name','asc') - ->pluck('name', 'id'); - - $itemslearning = \App\UnityTopic::where('status','=','1') - ->orderBy('status','desc') - ->orderBy('name','asc') - ->where('level','=','1') - ->pluck('name', 'id'); - - $filter = $request->input('topicList',$topiclist[0]['id']); - - if ($filter=='0') { - $entities=\App\UnityTask::all(); - } else { - - $entities = \App\UnityTask::where('topic','=',$filter) - ->select( - 'tasks.id', - 'tasks.taskno', - 'tasks.desc', - 'tasks.topic', - 'topics.name' - ) - ->join( - 'topics', - 'topics.id','=','tasks.topic' - ) - ->orderBy('tasks.taskno','asc') - ->get(); - } - - if (Auth::user()->roleid=='admin') { - return view('admin/tasks/index') - ->with(compact('entities')) - ->with(compact('items')) - ->with(compact('filter')); - } else { - $topic = \App\UnityTopic::where('topics.id','=',$filter) - ->select( - 'topics.id', - 'topics.name', - 'topics.desc', - 'learning_files.guide', - 'learning_files.testfile', - 'learning_files.supplement', - 'learning_files.other' - ) - ->leftJoin('learning_files', 'learning_files.topic', '=', 'topics.id') - ->first(); - return view('student/unitycourse/tasks/index') - ->with(compact('entities')) - ->with(compact('items')) - ->with(compact('itemslearning')) - ->with(compact('filter')) - ->with(compact('topic')); - } -} - - -public function getTopic($id){ - $items = \App\UnityTopic::find($id); - - return $items['name']; -} - - -public function filterTask() { - $filters = \App\UnityTopic::get(); - $filter = \App\UnityTopic::findOrFail(Input::get('filter_id')); - - $data= \App\UnityTask::with('topic')->where('topic', '=' , $filter->id )->latest()->get(); - - return View::make('admin.tasks.index',compact('filters'))->withProfiles($data)->with('title', 'filter'); -} - -/** - * Show the form for creating a new resource. - * - * @return Response - */ -public function create() -{ - // - $items = \App\UnityTopic::pluck('name', 'id'); -//echo "kljasd;lkasdl"; - return view('admin/tasks/create')->with(compact('items')); -} -/** - * Store a newly created resource in storage. - * - * @return Response - */ -public function store(Request $request) -{ -//echo "YAAANNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN"; - // - $rules =[ - 'taskno'=>'required', - 'desc'=>'required' - ]; - - $msg=[ - 'taskno.required'=>'Task number must not empty', - 'desc.required'=>'Description must not empty' - ]; - - $validator=Validator::make($request->all(),$rules,$msg); - - //jika data ada yang kosong - if ($validator->fails()) { - - //refresh halaman - return Redirect::to('admin/tasks/create') - ->withErrors($validator); - - }else{ - - $entity=new \App\UnityTask; - - $entity->desc=$request->get('desc'); - $entity->taskno=$request->get('taskno'); - $entity->topic=$request->get('topic'); - $entity->save(); - - Session::flash('message','A New Task Stored'); - - //return "Add new topic is success"; - return Redirect::to('admin/tasks'); - } -} - -/** - * Display the specified resource. - * - * @param int $id - * @return Response - */ -public function show(Request $request, $id) -{ - $entity = \App\UnityTask::find($id); - $topic = \App\UnityTopic::find($entity->topic); - $x=['data'=>$entity, 'topic'=>$topic]; - - if ($request->is('admin/*')) { - return view('admin/tasks/show')->with($x); - } else { - return view('student/unitycourse/tasks/show')->with($x); - } -} - -/** - * Show the form for editing the specified resource. - * - * @param int $id - * @return Response - */ -public function edit($id) -{ - // - $entity = \App\UnityTask::find($id); - $x=['data'=>$entity]; - $items = \App\UnityTopic::pluck('name', 'id'); - return view('admin/tasks/edit')->with($x)->with(compact('items')); -} - -/** - * Update the specified resource in storage. - * - * @param int $id - * @return Response - */ -public function update(Request $request, $id) -{ - // - $rules =[ - 'taskno'=>'required', - 'desc'=>'required' - ]; - - $msg=[ - 'taskno.required'=>'Task number must not empty', - 'desc.required'=>'Description must not empty' - ]; - - - $validator=Validator::make($request->all(),$rules,$msg); - - if ($validator->fails()) { - return Redirect::to('admin/topics/'.$id.'/edit') - ->withErrors($validator); - - }else{ - $entity=\App\UnityTask::find($id); - - $entity->desc=$request->get('desc'); - $entity->taskno=$request->get('taskno'); - $entity->topic=$request->get('topic'); - $entity->save(); - - Session::flash('message','Task with Id='.$id.' is changed'); - - return Redirect::to('admin/tasks'); - } -} - -/** - * Remove the specified resource from storage. - * - * @param int $id - * @return Response - */ -public function destroy($id) -{ - // - $entity = \App\UnityTask::find($id); - $entity->delete(); - Session::flash('message','Task with Id='.$id.' is deleted'); - return Redirect::to('admin/tasks'); -} -} diff --git a/app/Http/Controllers/UnityFileResultController.php b/app/Http/Controllers/UnityFileResultController.php deleted file mode 100644 index 7c7700f..0000000 --- a/app/Http/Controllers/UnityFileResultController.php +++ /dev/null @@ -1,131 +0,0 @@ -get(); - - return view('student/unitycourse/lfiles/create') - ->with(compact('files')) - ->with(compact('topic')); - } - - public function store(Request $request) - { - // - $rules =[ - 'rscfile'=>'required' - ]; - - $msg=[ - 'rscfile.required'=>'Resource File must not empty' - ]; - - $validator=Validator::make($request->all(),$rules,$msg); - - //jika data ada yang kosong - if ($validator->fails()) { - return Redirect::to('student/unitycourse/lfiles/create/'.$request->get('topic')) - ->withErrors($validator); - } else { - $file = $request->file('rscfile'); - $filename = $file->getClientOriginalName(); - - $fileinfo = \App\UnityTopicFiles::find($request->get('fileid')); - if ($fileinfo['fileName']!=$filename) { - return Redirect::to('student/unitycourse/lfiles/create/'.$request->get('topic')) - ->withErrors("File name should be ".$fileinfo['fileName']); - } else { - $result = \App\UnityFileResult::where('userid','=',Auth::user()->id) - ->where('fileid','=',$request->get('fileid')) - ->get(); - if (count($result)>0) { - return Redirect::to('student/unitycourse/lfiles/create/'.$request->get('topic')) - ->withErrors('File '.$fileinfo['fileName'].' was already submitted'); - } else { - $rsc=$file->store('resource','public'); - $entity=new \App\UnityFileResult; - - $entity->userid=Auth::user()->id; - $entity->fileid=$request->get('fileid'); - $entity->rscfile=$rsc; - $entity->save(); - - Session::flash('message','A New File Result Stored'); - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$fileinfo['topic'])->with( [ 'topic' => $request->get('topic') ] ); - } - } - } - } - - public function destroy(Request $request,$id) - { - // - $entity = \App\UnityFileResult::find($id); - - $path = storage_path('app\\public\\').$entity['rscfile']; - //$path = str_replace('\\',DIRECTORY_SEPARATOR,$path); - - //$dirpath = storage_path('app\\public\\\'); - File::delete(getPath($path)); - - $entity->delete(); - Session::flash('File Result with Id='.$id.' is deleted'); - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic')); - } - - - public function delete($id,$topic) - { - // - $entity = \App\UnityFileResult::find($id); - - $path = storage_path('app\\public\\').$entity['rscfile']; - //$path = str_replace('\\',DIRECTORY_SEPARATOR,$path); - - //$dirpath = storage_path('app\\public\\\'); - File::delete($path); - - $entity->delete(); - Session::flash('File Result with Id='.$id.' is deleted'); - return Redirect::to('student/unitycourse/results?topicList='.$topic.'&option=files'); - } - - - public function submit($id) { - // - $entity=new \App\UnityStudentSubmit; - - $entity->userid=Auth::user()->id; - $entity->topic=$id; - $entity->validstat="valid"; - $entity->save(); - - $topic = \App\UnityTopic::find($id); - Session::flash('message','Topic '.$topic['name'].' Validation is Success'); - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$id); - - } - - public function getPath($path) { - $res = str_replace('\\',DIRECTORY_SEPARATOR,$path); - return str_replace('/',DIRECTORY_SEPARATOR,$res); - } -} diff --git a/app/Http/Controllers/UnityResultController.php b/app/Http/Controllers/UnityResultController.php deleted file mode 100644 index a58b3a7..0000000 --- a/app/Http/Controllers/UnityResultController.php +++ /dev/null @@ -1,385 +0,0 @@ -id); - //if ($check->count()==0) return view('student/home')->with(['count'=>$check->count()]); -$check=\App\User::find(Auth::user()->id); -if ($check->status!='active') return view('student/unitycourse/home')->with(['status'=>$check->status]); - - $filter = $request->input('topicList','6'); - if ($filter=='0') { - $entities=\App\UnityTaskResult::where('userid','=',Auth::user()->id); - } else { - $entities = \App\UnityTask::where('tasks.topic','=',$filter) - ->select( - 'task_results.id', - 'task_results.taskid', - 'task_results.userid', - 'task_results.status', - 'task_results.duration', - 'task_results.comment', - 'task_results.imgFile', - 'tasks.taskno', - 'tasks.desc', - 'tasks.topic' - ) - ->leftJoin('task_results', function($join) - { - $join->on('tasks.id','=','task_results.taskid') - ->where('task_results.userid', '=', Auth::user()->id); - } - ) - ->orderBy('tasks.taskno', 'asc') - ->get(); - } - - $lfiles = \App\UnityTopicFiles::where('topic_files.topic','=',$filter) - ->select( - 'file_results.id', - 'file_results.userid', - 'file_results.rscfile', - 'file_results.fileid', - 'topic_files.fileName', - 'topic_files.path', - 'topic_files.desc' - ) - ->leftJoin('file_results', function($join) - { - $join->on('topic_files.id','=','file_results.fileid') - ->where('file_results.userid', '=', Auth::user()->id); - } - ) - ->orderBy('topic_files.fileName', 'asc') - ->get(); - - $items = \App\UnityTopic:: - where('status','>=','0') - ->where('androidclass','=','AndroidX') - ->orderBy('name','asc') - ->orderBy('level','asc') - ->pluck('name', 'id'); - - $valid = \App\UnityStudentSubmit::where('userid','=',Auth::user()->id) - ->where('topic','=',$filter) - ->get()->count(); - - $option = $request->input('option','github'); - - $currtopic = \App\UnityTopic::find($filter); - - return view('student/unitycourse/results/index') - ->with(compact('entities')) - ->with(compact('lfiles')) - ->with(compact('items')) - ->with(compact('filter')) - ->with(compact('option')) - ->with(compact('currtopic')) - ->with(compact('valid')); - - } - - - - public function getTaskData($topic) { - $items = \App\UnityTask::where('tasks.topic','=',$topic) - ->select( - 'tasks.id', - 'tasks.taskno', - 'tasks.desc', - 'topics.name' - ) - ->join( - 'topics', - 'topics.id','=','tasks.topic' - ) - ->orderBy('topics.name', 'asc') - ->orderBy('tasks.taskno', 'asc') - ->get(); - - return $items; - } - public function create($id) - { - $items = \App\UnityTask::where('topic','=',$id) - ->orderBy('taskno', 'asc') - ->get(); - $topic = \App\UnityTopic::find($id); - return view('student/unitycourse/results/create') - ->with(compact('topic')) - ->with(compact('items')); - } - -private function validateByFiles($userid, $topic) { - // - $entity=new \App\UnityStudentSubmit; - - $entity->userid=$userid; - $entity->topic=$topic; - $entity->validstat="valid"; - $entity->save(); - - $data = \App\UnityTopic::find($topic); - Session::flash('message','Topic '.$data['name'].' Validation is Success'); - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$topic.'&option=files'); -} - -private function validateZipFile($userid, $topic, $file, $path) { - // - //$file = $request->file('zipfile'); - if ($path!='' ) { - //$array = explode('.', $path); - //$ext = strtolower(end($array)); - $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION)); - if ($ext=="zip") { - $zipFile=$file->store('results','public'); - - if ($zipFile!='') { - $entity=new \App\UnityStudentSubmit; - - $entity->userid=$userid; - $entity->topic=$topic; - $entity->validstat="valid"; - $entity->projectfile=$zipFile; - - $entity->save(); - - $data = \App\UnityTopic::find($topic); - Session::flash('message','Topic '.$data['name'].' Validation by Uploading Zip Project is Success'); - } else { - Session::flash('message','Storing file '.$request->file('zipfile').' was FAILED'); - } - } else { - Session::flash('message','File extension is not zip -> '.$path.' is wrong .'.$ext); - } - } else { - Session::flash('message','Zip File is empty'); - } - - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$topic.'&option=zipfile'); -} - - -private function validateGithubLink($userid, $topic, $link, $projname) { - // - $trimmedlink = trim($link); - if ($this->validateUrl($trimmedlink,$projname)) { - $entity=new \App\UnityStudentSubmit; - - $entity->userid=$userid; - $entity->topic=$topic; - $entity->validstat="valid"; - $entity->githublink=$trimmedlink; - - $entity->save(); - - $data = \App\UnityTopic::find($topic); - Session::flash('message','Topic '.$data['name'].' Validation by submitting GitHub link is Success'); - - //Session::flash('message','URL valid '.$link); - - } else { - Session::flash('message','URL is not VALID '.$link); - } - - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$topic.'&option=github'); -} - -private function validateUrl($url,$projname) { - $path = parse_url($url, PHP_URL_PATH); - $encoded_path = array_map('urlencode', explode('/', $path)); - $url = str_replace($path, implode('/', $encoded_path), $url); - - if (filter_var($url, FILTER_VALIDATE_URL)) { - $result = parse_url($url); - if ( ($result['scheme']=='https') && ($this->endsWith($result['host'],'github.com')) - && (strpos($result['path'],$projname)) ) { - return true; - } else { - return false; - } - } else { - return false; - } -} - -private function endsWith($haystack, $needle) { - return substr_compare($haystack, $needle, -strlen($needle)) === 0; -} - - - private function saveTaskResult(Request $request) - { - // - $rules =[ - 'duration'=>'required', - 'image'=>'required', - 'comment'=>'required' - ]; - - $msg=[ - 'duration.required'=>'Duration time must not empty', - 'image.required'=>'Evidence image file must not empty', - 'comment.required'=>'Comment must not empty' - ]; - - $validator=Validator::make($request->all(),$rules,$msg); - - //jika data ada yang kosong - if ($validator->fails()) { - - //refresh halaman - return Redirect::to('student/unitycourse/results/create/'.$request->get('topic')) - ->withErrors($validator); - - } else { - $check = \App\UnityTaskResult::where('userid','=',Auth::user()->id) - ->where('taskid','=',$request->get('taskid')) - ->get(); - - if (sizeof($check)>0) { - $task = \App\UnityTask::find($request->get('taskid')); - $message = 'Result of Task '.$task['desc'].' is already submitted!!'; - //Session::flash('message',); - return Redirect::to('student/unitycourse/results/create'.$request->get('topic'))->withErrors($message); - - } else { - $file = $request->file('image'); - $imgFile=$file->store('results','public'); - - $entity=new \App\UnityTaskResult; - - $comment = ($request->get('comment')==null)?'-':$request->get('comment'); - - $entity->userid=Auth::user()->id; - $entity->taskid=$request->get('taskid'); - $entity->status=$request->get('status'); - $entity->duration=$request->get('duration'); - $entity->comment=$comment; - $entity->imgFile=$imgFile; - $entity->save(); - - Session::flash('message','A New Task Result Stored'); - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic'))->with( [ 'topic' => $request->get('topic') ] ); - } - } - } - - - public function store(Request $request) - { - if (strlen($request->get('option'))>3) { - if (($request->get('action')=='validate') && (strlen($request->submitbutton)>5)) { - if ($request->get('option')=='files') { - return $this->validateByFiles(Auth::user()->id, $request->get('topic')); - } else if ($request->get('option')=='zipfile') { - $file = $request->file('zipfile'); - $filename = $file->getClientOriginalName(); - return $this->validateZipFile(Auth::user()->id, $request->get('topic'), $file, $filename); - } else if ($request->get('option')=='github') { - return $this->validateGithubLink(Auth::user()->id, $request->get('topic'), $request->get('githublink'), - $request->get('projname')); - } else { - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic').'&option='.$request->get('option'). - '&submit='.$request->submitbutton); - } - } else { //clicking radio button - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic').'&option='.$request->get('option')); - //'&submit='.$request->submitbutton); - } - - } else { //echo $request; - return $this->saveTaskResult($request); - } - } - - - public function destroy(Request $request, $id) - { - // - $entity = \App\UnityTaskResult::find($id); - $entity->delete(); - Session::flash('message','Task Result with Id='.$id.' is deleted'); - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic')); - } - - public function edit($id) - { - // - $entity = \App\UnityTaskResult::where('id','=',$id)->first(); - $task = \App\UnityTask::where('id','=',$entity['taskid'])->first(); - return view('student/unitycourse/results/edit')->with(compact('entity')) - ->with(compact('task')); - } - - public function valsub(Request $request) - { - $items = \App\UnityTask::where('topic','=',$id) - ->orderBy('taskno', 'asc') - ->get(); - $topic = \App\UnityTopic::find($id); - return view('student/unitycourse/results/create') - ->with(compact('topic')) - ->with(compact('items')); - } - - - public function update(Request $request, $id) { - // - $rules =[ - 'duration'=>'required', - ]; - - $msg=[ - 'duration.required'=>'Duration time must not empty', - ]; - - - $validator=Validator::make($request->all(),$rules,$msg); - - if ($validator->fails()) { - return Redirect::to('student/unitycourse/results/'.$id.'/edit') - ->withErrors($validator); - - }else{ - $file = $request->file('image'); - - $entity=\App\UnityTaskResult::find($id); - - $entity->taskid=$request->get('taskid'); - $entity->status=$request->get('status'); - $entity->duration=$request->get('duration'); - $entity->comment=$request->get('comment'); - - if ($file!='') { - $imgFile=$file->store('results','public'); - $entity->imgFile=$imgFile; - } - $entity->save(); - - Session::flash('message','Task Result with Id='.$id.' is changed'); - - $task = \App\UnityTask::find($request->get('taskid')); - return Redirect::to('student/unitycourse/results?topicList='.$task['topic']); - } - } -} - diff --git a/app/Http/Controllers/UnityTaskResultController.php b/app/Http/Controllers/UnityTaskResultController.php deleted file mode 100644 index 213481d..0000000 --- a/app/Http/Controllers/UnityTaskResultController.php +++ /dev/null @@ -1,379 +0,0 @@ -id); -if ($check->status!='active') return view('student/unitycourse/home')->with(['status'=>$check->status]); - - $filter = $request->input('topicList','6'); - if ($filter=='0') { - $entities=\App\UnityTaskResult::where('userid','=',Auth::user()->id); - } else { - $entities = \App\UnityTask::where('tasks.topic','=',$filter) - ->select( - 'task_results.id', - 'task_results.taskid', - 'task_results.userid', - 'task_results.status', - 'task_results.duration', - 'task_results.comment', - 'task_results.imgFile', - 'tasks.taskno', - 'tasks.desc', - 'tasks.topic' - ) - ->leftJoin('task_results', function($join) - { - $join->on('tasks.id','=','task_results.taskid') - ->where('task_results.userid', '=', Auth::user()->id); - } - ) - ->orderBy('tasks.taskno', 'asc') - ->get(); - } - - $lfiles = \App\UnityTopicFiles::where('topic_files.topic','=',$filter) - ->select( - 'file_results.id', - 'file_results.userid', - 'file_results.rscfile', - 'file_results.fileid', - 'topic_files.fileName', - 'topic_files.path', - 'topic_files.desc' - ) - ->leftJoin('file_results', function($join) - { - $join->on('topic_files.id','=','file_results.fileid') - ->where('file_results.userid', '=', Auth::user()->id); - } - ) - ->orderBy('topic_files.fileName', 'asc') - ->get(); - - $items = \App\UnityTopic:: - where('status','>=','0') - ->where('androidclass','=','AndroidX') - ->orderBy('name','asc') - ->orderBy('level','asc') - ->pluck('name', 'id'); - - $valid = \App\UnityStudentSubmit::where('userid','=',Auth::user()->id) - ->where('topic','=',$filter) - ->get()->count(); - - $option = $request->input('option','github'); - - $currtopic = \App\UnityTopic::find($filter); - - return view('student/unitycourse/results/index') - ->with(compact('entities')) - ->with(compact('lfiles')) - ->with(compact('items')) - ->with(compact('filter')) - ->with(compact('option')) - ->with(compact('currtopic')) - ->with(compact('valid')); - - } - - - - public function getTaskData($topic) { - $items = \App\UnityTask::where('tasks.topic','=',$topic) - ->select( - 'tasks.id', - 'tasks.taskno', - 'tasks.desc', - 'topics.name' - ) - ->join( - 'topics', - 'topics.id','=','tasks.topic' - ) - ->orderBy('topics.name', 'asc') - ->orderBy('tasks.taskno', 'asc') - ->get(); - - return $items; - } - public function create($id) - { - $items = \App\UnityTask::where('topic','=',$id) - ->orderBy('taskno', 'asc') - ->get(); - $topic = \App\UnityTopic::find($id); - return view('student/unitycourse/results/create') - ->with(compact('topic')) - ->with(compact('items')); - } - -private function validateByFiles($userid, $topic) { - // - $entity=new \App\UnityStudentSubmit; - - $entity->userid=$userid; - $entity->topic=$topic; - $entity->validstat="valid"; - $entity->save(); - - $data = \App\UnityTopic::find($topic); - Session::flash('message','Topic '.$data['name'].' Validation is Success'); - - return Redirect::to('student/unitycourse/results?topicList='.$topic.'&option=files'); -} - -private function validateZipFile($userid, $topic, $file, $path) { - - if ($path!='' ) { - $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION)); - if ($ext=="zip") { - $zipFile=$file->store('results','public'); - - if ($zipFile!='') { - $entity=new \App\UnityStudentSubmit; - - $entity->userid=$userid; - $entity->topic=$topic; - $entity->validstat="valid"; - $entity->projectfile=$zipFile; - - $entity->save(); - - $data = \App\UnityTopic::find($topic); - Session::flash('message','Topic '.$data['name'].' Validation by Uploading Zip Project is Success'); - } else { - Session::flash('message','Storing file '.$request->file('zipfile').' was FAILED'); - } - } else { - Session::flash('message','File extension is not zip -> '.$path.' is wrong .'.$ext); - } - } else { - Session::flash('message','Zip File is empty'); - } - - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$topic.'&option=zipfile'); -} - -private function validateGithubLink($userid, $topic, $link, $projname) { - // - $trimmedlink = trim($link); - if ($this->validateUrl($trimmedlink,$projname)) { - - $entity=new \App\UnityStudentSubmit; - - $entity->userid=$userid; - $entity->topic=$topic; - $entity->validstat="valid"; - $entity->githublink=$trimmedlink; - - $entity->save(); - - $data = \App\UnityTopic::find($topic); - Session::flash('message','Topic '.$data['name'].' Validation by submitting GitHub link is Success'); - - //Session::flash('message','URL valid '.$link); - - } else { - Session::flash('message','URL is not VALID '.$link); - } - - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$topic.'&option=github'); -} - -private function validateUrl($url,$projname) { - $path = parse_url($url, PHP_URL_PATH); - $encoded_path = array_map('urlencode', explode('/', $path)); - $url = str_replace($path, implode('/', $encoded_path), $url); - - if (filter_var($url, FILTER_VALIDATE_URL)) { - $result = parse_url($url); - if ( ($result['scheme']=='https') && ($this->endsWith($result['host'],'github.com')) - && (strpos($result['path'],$projname)) ) { - return true; - } else { - return false; - } - } else { - return false; - } -} - -private function endsWith($haystack, $needle) { - return substr_compare($haystack, $needle, -strlen($needle)) === 0; -} - - - private function saveTaskResult(Request $request) - { - // - $rules =[ - 'duration'=>'required', - 'image'=>'required', - 'comment'=>'required' - ]; - - $msg=[ - 'duration.required'=>'Duration time must not empty', - 'image.required'=>'Evidence image file must not empty', - 'comment.required'=>'Comment must not empty' - ]; - - $validator=Validator::make($request->all(),$rules,$msg); - - //jika data ada yang kosong - if ($validator->fails()) { - - //refresh halaman - return Redirect::to('student/unitycourse/results/create/'.$request->get('topic')) - ->withErrors($validator); - - } else { - $check = \App\UnityTaskResult::where('userid','=',Auth::user()->id) - ->where('taskid','=',$request->get('taskid')) - ->get(); - - if (sizeof($check)>0) { - $task = \App\UnityTask::find($request->get('taskid')); - $message = 'Result of Task '.$task['desc'].' is already submitted!!'; - //Session::flash('message',); - return Redirect::to('student/unitycourse/results/create'.$request->get('topic'))->withErrors($message); - - } else { - $file = $request->file('image'); - $imgFile=$file->store('result','public'); - - $entity=new \App\UnityTaskResult; - - $comment = ($request->get('comment')==null)?'-':$request->get('comment'); - - $entity->userid=Auth::user()->id; - $entity->taskid=$request->get('taskid'); - $entity->status=$request->get('status'); - $entity->duration=$request->get('duration'); - $entity->comment=$comment; - $entity->imgFile=$imgFile; - $entity->save(); - - Session::flash('message','A New Task Result Stored'); - - //return "Add new topic is success"; - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic'))->with( [ 'topic' => $request->get('topic') ] ); - } - } - } - - - public function store(Request $request) - { - if (strlen($request->get('option'))>3) { - if (($request->get('action')=='validate') && (strlen($request->submitbutton)>5)) { - if ($request->get('option')=='files') { - return $this->validateByFiles(Auth::user()->id, $request->get('topic')); - } else if ($request->get('option')=='zipfile') { - $file = $request->file('zipfile'); - $filename = $file->getClientOriginalName(); - return $this->validateZipFile(Auth::user()->id, $request->get('topic'), $file, $filename); - } else if ($request->get('option')=='github') { - return $this->validateGithubLink(Auth::user()->id, $request->get('topic'), $request->get('githublink'), - $request->get('projname')); - } else { - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic').'&option='.$request->get('option'). - '&submit='.$request->submitbutton); - } - } else { //clicking radio button - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic').'&option='.$request->get('option')); - //'&submit='.$request->submitbutton); - } - - } else { //echo $request; - return $this->saveTaskResult($request); - } - } - - - public function destroy(Request $request, $id) - { - // - $entity = \App\UnityTaskResult::find($id); - $entity->delete(); - Session::flash('message','Task Result with Id='.$id.' is deleted'); - return Redirect::to('student/unitycourse/results?topicList='.$request->get('topic')); - } - - public function edit($id) - { - // - $entity = \App\UnityTaskResult::where('id','=',$id)->first(); - $task = \App\UnityTask::where('id','=',$entity['taskid'])->first(); - return view('student/unitycourse/results/edit')->with(compact('entity')) - ->with(compact('task')); - } - - public function valsub(Request $request) - { - $items = \App\UnityTask::where('topic','=',$id) - ->orderBy('taskno', 'asc') - ->get(); - $topic = \App\UnityTopic::find($id); - return view('student/unitycourse/results/create') - ->with(compact('topic')) - ->with(compact('items')); - } - - - public function update(Request $request, $id) { - // - $rules =[ - 'duration'=>'required', - ]; - - $msg=[ - 'duration.required'=>'Duration time must not empty', - ]; - - - $validator=Validator::make($request->all(),$rules,$msg); - - if ($validator->fails()) { - return Redirect::to('student/unitycourse/results/'.$id.'/edit') - ->withErrors($validator); - - }else{ - $file = $request->file('image'); - - $entity=\App\UnityTaskResult::find($id); - - $entity->taskid=$request->get('taskid'); - $entity->status=$request->get('status'); - $entity->duration=$request->get('duration'); - $entity->comment=$request->get('comment'); - - if ($file!='') { - $imgFile=$file->store('results','public'); - $entity->imgFile=$imgFile; - } - $entity->save(); - - Session::flash('message','Task Result with Id='.$id.' is changed'); - - $task = \App\UnityTask::find($request->get('taskid')); - return Redirect::to('student/unitycourse/results?topicList='.$task['topic']); - } - } -} - diff --git a/app/UnityStudentSubmit.php b/app/UnityStudentSubmit.php deleted file mode 100644 index de33156..0000000 --- a/app/UnityStudentSubmit.php +++ /dev/null @@ -1,12 +0,0 @@ -belongsTo(App\UnityTopic::class); - } - - public function getTopic($id) { - return \App\UnityTopic::find($id)->name; - } - - public function getListTopic() { - return \App\UnityTopic::pluck('name', 'id'); - } -} diff --git a/app/UnityTaskResult.php b/app/UnityTaskResult.php deleted file mode 100644 index 6ed6e04..0000000 --- a/app/UnityTaskResult.php +++ /dev/null @@ -1,11 +0,0 @@ -hasMany('App\UnityTask'); - } - - public function topic_files() { - return $this->hasMany('App\UnityTopicFiles'); - } - - public function test_files() { - return $this->hasMany('App\UnityTestFiles'); - } -} diff --git a/app/UnityTopicFiles.php b/app/UnityTopicFiles.php deleted file mode 100644 index f72ce1b..0000000 --- a/app/UnityTopicFiles.php +++ /dev/null @@ -1,15 +0,0 @@ -belongsTo(App\UnityTopic::class); - } -} diff --git a/app/UnityUser.php b/app/UnityUser.php deleted file mode 100644 index b6e56a1..0000000 --- a/app/UnityUser.php +++ /dev/null @@ -1,52 +0,0 @@ - 'datetime', - ]; - - public function checkRoleId($roleid) { - if ($roleid=='student') { - return Redirect::to('student/unitycourse/home'); - } elseif ($roleid=='teacher') { - return Redirect::to('teacher/home'); - } elseif ($roleid=='admin') { - return Redirect::to('admin/admin'); - } else { - return Redirect::to('/home'); - } - } -} diff --git a/resources/views/student/landingpage.blade.php b/resources/views/student/landingpage.blade.php index 4526ca0..8968ccc 100644 --- a/resources/views/student/landingpage.blade.php +++ b/resources/views/student/landingpage.blade.php @@ -111,21 +111,6 @@ -
-
-
-

Unity

-

Unity 3D is a software engine for developing games with casual, AR (Augmented Reality) and VR (Virtual Reality) genres. The game results from Unity 3D are cross-platform. Which means you can publish your game to multiple platforms.

-
-
- -
diff --git a/routes/web.php b/routes/web.php index c23bcf9..44fda6b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -196,17 +196,6 @@ Route::group(['middleware' => ['auth', 'student']], function () { Route::get('/student/lfiles/nodejscourse/create/{topic}', 'NodejsFileResultController@create'); Route::get('/student/lfiles/nodejscourse/valid/{topic}', 'NodejsFileResultController@submit'); Route::get('/student/lfiles/nodejscourse/delete/{id}/{topic}', 'NodejsFileResultController@delete'); - //Unity// - Route::patch('/student/unitycourse/results/valsub', ['as' => 'results.valsub', 'uses' => 'UnityTaskResultController@valsub']); - Route::get('/student/unitycourse/results/create/{topic}', 'UnityTaskResultController@create'); - Route::get('/student/unitycourse', 'StudentController@unitycourse'); - Route::get('/student/unitycourse/topic', 'StudentController@unitycoursetopic'); - Route::resource('/student/unitycourse/tasks', 'UnityController'); - Route::resource('/student/unitycourse/results', 'UnityResultController'); - Route::resource('/student/unitycourse/lfiles', 'UnityFileResultController'); - Route::get('/student/lfiles/unitycourse/create/{topic}', 'UnityFileResultController@create'); - Route::get('/student/lfiles/unitycourse/valid/{topic}', 'UnityFileResultController@submit'); - Route::get('/student/lfiles/unitycourse/delete/{id}/{topic}', 'UnityFileResultController@delete'); /** Python */