diff --git a/taskapp/handle.sh b/taskapp/handle.sh index 12f1228..e96f3a7 100755 --- a/taskapp/handle.sh +++ b/taskapp/handle.sh @@ -4,6 +4,20 @@ # $2 - mode # $3 - dev ip # $4 - state -# $5 - description +# $5 - recipient telephone +# $6 - description -echo "'$1', '$2', '$3', '$4', '$5'" >> /tmp/handle.log + +text='' +if [[ "$1" == "start" ]] +then + text="Новая задача" +else + text="Изменение задачи" +fi + +FULLTEXT="TO $5: $text: $3, $2. $6" + +echo "$FULLTEXT" >> /tmp/task_sms.log + +#/usr/bin/gammu-smsd-inject TEXT $5 -text "$FULLTEXT" -unicode diff --git a/taskapp/models.py b/taskapp/models.py index 6f87169..107b911 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -68,13 +68,11 @@ class Task(models.Model): def task_handler(sender, instance, **kwargs): cur_dir = os.path.join(BASE_DIR, "taskapp") if kwargs['created']: - call(['%s/handle.sh' % cur_dir, 'start', instance.mode, instance.device.ip_address, - instance.state, instance.descr]) - print 'Create task from', instance.author, ' to ', instance.recipient + first_param = 'start' else: - call(['%s/handle.sh' % cur_dir, 'change', instance.mode, instance.device.ip_address, - instance.state, instance.descr]) - print 'Change task' + first_param = 'change' + call(['%s/handle.sh' % cur_dir, first_param, instance.get_mode_display(), instance.device.ip_address, + instance.state, instance.recipient.telephone, instance.descr]) models.signals.post_save.connect(task_handler, sender=Task)