added id to ChartView, updated readme.md, added Pillow to setup requi…

…rements, fixed views for Django >= 1.7

README.md

@@ -93,6 +93,10 @@ and add the following PyScada specific parameters to your settings (PySadaServer
 ```
 STATIC_ROOT = BASE_DIR + '/static/'
 
+MEDIA_URL = '/media/'
+
+MEDIA_ROOT = BASE_DIR + '/media/'
+
 # PyScada settings
 # https://github.com/trombastic/PyScada
 
@@ -103,23 +107,28 @@ PID_ROOT = BASE_DIR + '/run/'
 # 
 PYSCADA_CLIENTS = (
 	('modbus','Modbus Client',),
+	('systemstat','Monitor Local System',),
 )
 
 # parameters for the Modbus Client
 # 	polling_interval 	how often the modbus client requests data
 #						from devices and write to the cache
 #
-#	recording_intervall	how often the data is written to the database
+#	recording_intervall how often the data is written to the database
 #
 # 	pid_file			file were the daemon pid is stored
 
 PYSCADA_MODBUS = {
-	'polling_interval':1,
-	'recording_intervall':5,
-	'cache_timeout':1440,
-	'pid_file_name': 'modbus-daemon.pid'
+    'polling_interval':5,
+    'recording_interval':5,
+    'pid_file_name': 'daemon-modbus.pid'
 }
 
+PYSCADA_SYSTEMSTAT = {
+    'polling_interval':5,
+    'recording_interval':5,
+    'pid_file_name': 'daemon-sysstat.pid'
+}
 ```
 
 urls.py

pyscada/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.6.12'
+__version__ = '0.6.13'
 __author__  = 'Martin Schroeder'

pyscada/admin.py

@@ -16,8 +16,10 @@
 
 class VariableAdminForm(forms.ModelForm):
     json_configuration = forms.CharField(widget=forms.Textarea)
+
     class Meta:
-        model = Variable
+		fields = []
+		model = Variable
 
 class VariableImportAdmin(admin.ModelAdmin):
     actions = None
@@ -126,4 +128,4 @@ def has_delete_permission(self, request, obj=None):
 admin.site.register(ClientWriteTask,ClientWriteTaskAdmin)
 admin.site.register(Log,LogAdmin)
 admin.site.register(BackgroundTask,BackgroundTaskAdmin)
-admin.site.register(RecordedDataCache,RecordedDataCacheAdmin)
+admin.site.register(RecordedDataCache,RecordedDataCacheAdmin)

pyscada/hmi/admin.py

@@ -32,7 +32,9 @@ class ChartAdmin(admin.ModelAdmin):
     #ordering = ['position',]
     search_fields = ['name',]
     filter_horizontal = ('variables',)
-    list_display = ('title',)
+    List_display_link = ('title',)
+    list_display = ('id','title',)
+    list_filter = ('widget',)
     form = ChartForm
     def name(self, instance):
         return instance.variables.name
@@ -92,4 +94,4 @@ class CustomHTMLPanelAdmin(admin.ModelAdmin):
 admin.site.register(CustomHTMLPanel,CustomHTMLPanelAdmin)
 admin.site.register(ChartSet)
 admin.site.register(Widget,WidgetAdmin)
-admin.site.register(View,ViewAdmin)
+admin.site.register(View,ViewAdmin)

setup.py

@@ -31,10 +31,11 @@
         'pymodbus>=1.2',
         'numpy>=1.6.0',
         'h5py>=2.1.1',
-        'psutil>=2.1.1'
+        'psutil>=2.1.1',
+        'pillow'
     ],
     packages=find_packages(exclude=["project", "project.*"]),
     include_package_data=True,
     zip_safe=False,
     test_suite='runtests.main',
-)
+)