-Upload des images : in progress

constant.php

@@ -12,20 +12,22 @@ define('AVATAR_PATH','avatar'.SLASH);
 
 define('BASE_SGBD','Mysql');
 define('BASE_HOST','localhost');
-define('BASE_NAME','erp-core');
+define('BASE_NAME','hackpoint');
 define('BASE_LOGIN','root');
-define('BASE_PASSWORD','root');
+define('BASE_PASSWORD','');
 
 define('ROOT_URL','http://127.0.0.1/hackpoint');
-define('CRYPTKEY','MTU0MjM1MjQyOXJvb3QyNzY=');
-define('BASE_DEBUG',true);
-define('COOKIE_NAME','erp-core-coockie');
+define('CRYPTKEY','MTU1NDQ3Nzg0M3Jvb3QyMzQ=');
+//logs toutes les requetes sans formattage
+define('BASE_DEBUG',false);
+
+define('COOKIE_NAME','erp-core-cookie');
 
 define('PROGRAM_NAME','Hackpoint');
-define('PROGRAM_UID','idleman/erp-core');
+define('PROGRAM_UID','idleman/hackpoint');
 define('PROGRAM_TECHNICIAN','valentin.carruesco');
 
-define('SOURCE_VERSION','1.0');
-define('BASE_VERSION','1.0');
+define('SOURCE_VERSION','1.5');
+define('BASE_VERSION','1.5');
 
 ?>

cron.log

@@ -1 +0,0 @@
-08-03-2019 10:53 | Le cron ne peut être executé qu'en mode CLI depuis le serveur

js/main.js

@@ -525,7 +525,8 @@ function init_components(selector){
 					});
 				}
 				var preview = '<li data-path="{{path}}">';
-			    preview += input.attr('data-preview')=="true" ? '<img style="margin: 0 5px;float: left;max-height:100px;max-width:80px;" src="{{url}}"/>' : '<i class="fa {{icon}}"></i>';
+
+			    preview += input.get(0).hasAttribute('data-preview') ? '<img style="margin: 0 5px;float: left;max-height:100px;max-width:80px;" src="{{url}}"/>' : '<i class="fa {{icon}}"></i>';
 				preview += ' <a {{#url}}href="{{url}}"{{/url}} target="_blank" title="{{name}}">{{name}}{{lastModification}}</a> '+customActions+' <i class="fas fa-times pointer '+(input.attr('data-delete')?'':'hidden')+'" onclick="{{#temporary}}dropzone_delete_file(this);{{/temporary}}{{^temporary}}'+input.attr('data-delete')+'(this){{/temporary}}"></i><div class="clear"></div></li>';
 
 				var valueFiles = input.html()!='' && is_json_string(input.text()) ? JSON.parse(input.text()) : [];

js/plugins.js

@@ -470,7 +470,7 @@ $.fn.extend({
 			var obj = $(this); 
 			var model = null;
 			var container = null;
-			option = $.extend({},option);
+			option = $.extend({showItems:true},option);
 			var preloader = null;
 			if(option.preloader){
 				var preloader = $(option.preloader);
@@ -514,10 +514,16 @@ $.fn.extend({
 			tpl = tpl.replace(/(data-style)/g, 'style');
 
 			$.action(option,function(r){
+
 				for(var key in r.rows){
 					var line = $(Mustache.render(tpl,r.rows[key]));
 					container.append(line);
-					line.show().removeClass('hidden');
+
+					if(option.showItems){
+						line.show().removeClass('hidden');
+					}
+					
+
 				}
 				if(r.pagination){
 					

plugin/hackpoint/action.php

@@ -48,10 +48,10 @@ switch($_['action']){
 			global $myUser,$_;
 			if(!$myUser->can('hackpoint','edit')) throw new Exception("Permissions insuffisantes",403);
 			require_once(__DIR__.SLASH.'Sketch.class.php');
-			$item = Sketch::provide();
-			$item->label = $_['label'];
-			$item->state = $_['state'];
-			$item->comment = $_['comment'];
+			$item = Sketch::getById($_['id']);
+			if(isset($_['label'])) $item->label = $_['label'];
+			if(isset($_['state'])) $item->state = $_['state'];
+			if(isset($_['comment']))  $item->comment = $_['comment'];
 			$item->save();
 		});
 	break;
@@ -219,14 +219,14 @@ switch($_['action']){
 	//Suppression document
 	case 'resource_delete_document':
 	Action::write(function(&$response){
-		// global $myUser,$_;
-		// if(!$myUser->can('example','delete')) throw new Exception("Permissions insuffisantes",403);
-		// require_once(__DIR__.SLASH.'Resource.class.php');
-		// if(!isset($_['path']) ) throw new Exception("Chemin non spécifié ou non numerique");
-		// //Le premier argument est un namspace de sécurité 
-		// //et assure que le fichier sera toujours cloisoné dans un contexte file/contact/documents
-		// $path = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? utf8_decode($_['path']) : $_['path'];
-		// File::delete('contact'.SLASH.'documents',$path);
+		global $myUser,$_;
+		if(!$myUser->can('hackpoint','delete')) throw new Exception("Permissions insuffisantes",403);
+		require_once(__DIR__.SLASH.'Resource.class.php');
+		if(!isset($_['path']) ) throw new Exception("Chemin non spécifié ou non numerique");
+		//Le premier argument est un namspace de sécurité 
+		//et assure que le fichier sera toujours cloisoné dans un contexte file/hackpoint/sketch
+		$path = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? utf8_decode($_['path']) : $_['path'];
+		File::delete('hackpoint'.SLASH.'sketch',$path);
 	});
 	break;
 
@@ -237,7 +237,6 @@ switch($_['action']){
 		require_once(__DIR__.SLASH.'Resource.class.php');
 
 		$resource = Resource::provide();
-		
 		$folder = $resource->directory();
 
 		if(!file_exists($folder)) mkdir($folder,0755,true);

plugin/hackpoint/css/main.css

@@ -44,6 +44,14 @@
 	box-sizing: border-box;
 }
 
+.page-sheet-sketch .cm-s-monokai.CodeMirror {
+	background: #2e363e;
+}
+
+.page-sheet-sketch #mainMenu .navbar-brand {
+    padding-left: 99px;
+}
+
 .page-sheet-sketch .footer{
 	display: none;
 }
@@ -65,22 +73,23 @@
 }
 
 #sketch-workspace .input-group-text{
-	 background: #111111;
+	 background: #2e363e;
 	 color:#fefefe;
-	 border-color:#000000;
+	 border-color:#2e363e;
 }
 
 #resources-toolbar{
 	width:120px;
-	background-color: #333333;
+	background-color: #2b2f35;
 	color:#fefefe;
 	height:100%;
 	min-height: 100%;
+	position:relative;
 }
 #sketch-workspace{
 	flex: 1;
 	padding:15px;
-	 background: #272822;
+	 background: #3e4750;
 	box-sizing: border-box;
 }
 #resources-toolbar ul,#resources-toolbar li{
@@ -92,7 +101,8 @@
 	padding:10px;
 	cursor: pointer;
 	text-align: center;
-	transition: background 0.15s ease-in-out;
+	border-bottom: 1px solid #21252b;
+	transition: background 0.15s ease-in-out,transform 0.15s ease-in-out;
 	position: relative;
 }
 
@@ -107,7 +117,7 @@
 }
 
 #resources-toolbar ul li.active{
-	background:#000000;
+	background:#212223;
 }
 
 #resources-toolbar ul li:hover{
@@ -176,6 +186,10 @@
 	display: none;
 }
 
+.resource-dropdown{
+	position: absolute;
+	bottom: 0;
+}
 .resource-dropdown.dropright .dropdown-menu{
 	border-radius: 0;
     background: #333;
@@ -196,7 +210,42 @@
 }
 
 #sketch-workspace [data-type="dropzone"]{
-	background:#222222;
+	background:transparent;
 	color:#cecece;
 	border:0;
+}
+
+div.hackpoint-type-image[data-type="dropzone"] > div{
+	padding: 15px;
+    text-align: center;
+    margin: auto auto 10px auto;
+    width: 50%;
+    background: #444e58;
+ 
+}
+
+#sketch-editor{
+	overflow: auto;
+	height: 100%;
+	box-sizing: border-box;
+}
+
+.hackpoint-type-image img{
+	max-width: 100%!important;
+    max-height: 100%!important;
+    margin:5px 0!important;
+}
+.hackpoint-type-image li > a{
+	display: none;
+}
+
+div.hackpoint-type-image[data-type="dropzone"] > ul > li {
+    position: relative;
+    padding: 0px;
+    border-bottom: 0;
+    background: transparent;
+}
+
+div.hackpoint-type-image[data-type="dropzone"] > ul > li > i.pointer{
+	top:0;
 }

plugin/hackpoint/js/main.js

@@ -87,12 +87,14 @@ function hackpoint_sketch_search(callback){
 
 //Ajout ou modification d'élément sketch
 function hackpoint_sketch_save(){
-	var data = $('#sketch-form').toJson();
-	$.action(data,function(r){
-		
-		
-		$.message('success','Enregistré');
-	});
+	var data = {
+		action : 'hackpoint_sketch_save',
+		id : $('#sketch-form').attr('data-id'),
+		label : $('#label').val(),
+		state : $('#state').prop('checked'),
+		comment : $('#comment').val()
+	}
+	$.action(data);
 }
 
 
@@ -115,14 +117,15 @@ function hackpoint_sketch_delete(element){
 function hackpoint_resource_search(callback,triggered){
 	$('#resources').fill({
 		action:'hackpoint_resource_search',
-		sketch : $('#sketch-form').attr('data-id')
+		sketch : $('#sketch-form').attr('data-id'),
+		showItems : false
 	},function(){
 
-		
-		var trigger = triggered ? triggered: '#resources li:visible(:eq(0))';
-		$(trigger).trigger('click');
 
+
+		//rend les menu sortables
 		$( "#resources" ).sortable({
+			axis: "y",
 			update: function( event, ui ){
 				var sort = [];
 				$( "#resources li:visible" ).each(function(i,li){
@@ -139,6 +142,24 @@ function hackpoint_resource_search(callback,triggered){
 		});
     	$( "#resources" ).disableSelection();
 
+    	//affiche les menu de façon progressive
+    	$('#resources li:not(:eq(0))').removeClass('hidden')
+    	.css('transform','translateX(-120px)');
+    	$('#resources li:visible').each(function(i,element){
+    		setTimeout(function(){
+				$(element)
+				.css('transform','translateX(0px)');
+			},150*i);
+    	});
+    
+    	var trigger =  '#resources li:eq(1)';
+    	if(triggered){
+    		trigger = triggered;
+    	}else if($.urlParam('resource')){
+    		trigger = '#resources li[data-id="'+$.urlParam('resource')+'"]';
+    	}
+		
+		$(trigger).trigger('click');
 
 		if(callback!=null) callback();
 	});
@@ -154,6 +175,9 @@ function hackpoint_resource_edit(element){
 		id : id
 	},function(r){
 		$('#sketch-editor').html(r.html).attr('data-id',id);
+
+		window.history.replaceState(null, null, "index.php?module=hackpoint&page=sheet.sketch&id="+$('#sketch-form').attr('data-id')+"&resource="+id);
+
 		init_components('#sketch-editor');
 		if(r.javascript){
 			eval(r.javascript);
@@ -170,12 +194,12 @@ function resource_add_document(files){
 	}, function(r){
 		
 		$.each(r.files, function(i, file){
-			var line = $('li[data-path="'+file.oldPath+'"]', form);
+			var line = $('#sketch-editor li[data-path="'+file.oldPath+'"]');
 			line.attr('data-path', file.relative);
 			line.find('a').attr('href', file.url);
 			line.find('i.pointer').attr('onclick', 'resource_delete_document(this)');
 
-			$('[data-type="dropzone"] input:not(:visible)', form).val('');
+			$('#sketch-editor [data-type="dropzone"] input:not(:visible)').val('');
 			
 		});
 

plugin/hackpoint/page.sheet.sketch.php

@@ -43,7 +43,7 @@ if(!$sketch) throw new Exception("Sketch supprimé ou inexistant");
 		<div  id="sketch-workspace">
 				<div class="row">
 					<div class="col-md-8">
-						<h3 class="m-0"><input id="label" name="label" class="form-control-plaintext d-inline-block w-50 pt-0" placeholder="Nom du sketch ici" value="<?php echo $sketch->label; ?>" type="text"></h3>
+						<h3 class="m-0"><input id="label" name="label" class="form-control-plaintext d-inline-block w-50 pt-0" placeholder="Nom du sketch ici" onblur="hackpoint_sketch_save();" value="<?php echo $sketch->label; ?>" type="text"></h3>
 					</div>
 					<div class="col-md-4">
 						<!-- toolbar -->
@@ -55,7 +55,7 @@ if(!$sketch) throw new Exception("Sketch supprimé ou inexistant");
 							</div>
 							<div class="btn-group mr-2" role="group" aria-label="Properties">
 								<label for="state" class="input-group-text pointer m-0">
-									<input id="state" name="state" class="form-control" <?php echo $sketch->state?'checked="checked"':''; ?> type="checkbox" data-type="checkbox"> Public
+									<input id="state" name="state" class="form-control" onclick="hackpoint_sketch_save();" <?php echo $sketch->state?'checked="checked"':''; ?> type="checkbox" data-type="checkbox"> Public
 								</label>
 							</div>
 							<div class="btn-group" role="group" aria-label="Save">
@@ -64,7 +64,7 @@ if(!$sketch) throw new Exception("Sketch supprimé ou inexistant");
 						</div>
 					</div>
 				</div>
-				<input type="text" id="comment" name="comment" class="form-control-plaintext text-muted m-0 input-sm" value="<?php echo $sketch->comment; ?>">
+				<input type="text" id="comment" name="comment" onblur="hackpoint_sketch_save();" class="form-control-plaintext text-muted m-0 input-sm" value="<?php echo $sketch->comment; ?>">
 
 				<div id="sketch-editor"></div>
 

plugin/hackpoint/types/ImageType.class.php

@@ -73,7 +73,7 @@ class ImageType {
 		}
 
 		$response['html'] = '
-		<div data-type="dropzone" data-preview data-label="Faites glisser votre image ici" data-delete="resource_delete_document" data-save="resource_add_document" data-allowed="jpg,bmp,gif,png,jpeg,svg" class="form-control" id="document" name="document">
+		<div data-type="dropzone" data-preview data-label="Faites glisser vo(s) image(s) das cette zone ou cliquez dessus" data-delete="resource_delete_document" data-save="resource_add_document" data-allowed="jpg,bmp,gif,png,jpeg,svg" class="form-control hackpoint-type-image" id="document" name="document">
 				'.json_encode($images).'
 			</div>';
 		$response['upload'] = $infos['upload'];