Merge remote-tracking branch 'origin/master'
This commit is contained in:
		
							
								
								
									
										2
									
								
								app.py
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								app.py
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
from flask import Flask, request
 | 
					from flask import Flask
 | 
				
			||||||
from flask_cors import CORS
 | 
					from flask_cors import CORS
 | 
				
			||||||
from flask_jwt_extended import JWTManager
 | 
					from flask_jwt_extended import JWTManager
 | 
				
			||||||
from flask_migrate import Migrate
 | 
					from flask_migrate import Migrate
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										89
									
								
								assemblr.log
									
									
									
									
									
								
							
							
						
						
									
										89
									
								
								assemblr.log
									
									
									
									
									
								
							@@ -1,89 +0,0 @@
 | 
				
			|||||||
10-15 00:21 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-15 00:31 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-15 00:31 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-15 00:31 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-15 00:31 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-27 03:01 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-27 04:50 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-27 04:51 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-27 05:36 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-27 05:37 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-27 05:38 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-27 05:57 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 04:06 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 04:06 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 04:37 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 04:38 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 04:38 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 04:38 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:00 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:00 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:00 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:02 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:02 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:02 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:03 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:03 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:04 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:06 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:06 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:07 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:07 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:08 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:08 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:09 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-28 05:09 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-29 01:50 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-29 01:50 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-29 02:21 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-29 02:25 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-29 06:43 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-29 06:47 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-29 06:53 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 03:37 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 03:37 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 03:39 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 04:23 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:10 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:11 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:11 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:11 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:11 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:11 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:13 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:15 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:15 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:15 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:29 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:29 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:31 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:34 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:34 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:34 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:34 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:34 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:34 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:34 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:37 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:38 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 05:46 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 06:15 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 06:24 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 06:24 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 07:14 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 07:18 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 07:19 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 07:19 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
10-30 07:21 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-02 03:18 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-02 03:18 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-02 03:26 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-03 04:07 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-03 04:07 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-03 04:12 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-06 03:47 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-06 03:47 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-06 03:47 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-06 05:15 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-06 05:17 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
11-06 05:32 - assemblr - INFO - SiproClient successfully initialized
 | 
					 | 
				
			||||||
@@ -1,5 +1,4 @@
 | 
				
			|||||||
import datetime
 | 
					import datetime
 | 
				
			||||||
import time
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
from flask import Blueprint, request, jsonify
 | 
					from flask import Blueprint, request, jsonify
 | 
				
			||||||
from flask_jwt_extended import get_jwt_identity
 | 
					from flask_jwt_extended import get_jwt_identity
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
from flask import Blueprint, request, jsonify
 | 
					from flask import Blueprint, request, jsonify
 | 
				
			||||||
from flask_jwt_extended import create_access_token, jwt_required, get_jwt_identity
 | 
					from flask_jwt_extended import create_access_token
 | 
				
			||||||
from werkzeug.security import generate_password_hash, check_password_hash
 | 
					from werkzeug.security import generate_password_hash, check_password_hash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from database import User, db
 | 
					from database import User, db
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,6 @@ class BarcodesSynchronizer:
 | 
				
			|||||||
        existing_barcodes = database.Barcode.query.all()
 | 
					        existing_barcodes = database.Barcode.query.all()
 | 
				
			||||||
        denco_articles = list(set([barcode.denco_article for barcode in existing_barcodes]))
 | 
					        denco_articles = list(set([barcode.denco_article for barcode in existing_barcodes]))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
        query_string = 'SELECT product, barcode FROM modx_0_connections WHERE barcode != "" LIMIT 100'
 | 
					        query_string = 'SELECT product, barcode FROM modx_0_connections WHERE barcode != "" LIMIT 100'
 | 
				
			||||||
        for denco_article, barcodes_string in self.mariadb_connector.select(query_string):
 | 
					        for denco_article, barcodes_string in self.mariadb_connector.select(query_string):
 | 
				
			||||||
            barcodes = barcodes_string.split(',')
 | 
					            barcodes = barcodes_string.split(',')
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user